Merge "Added buttons for entering and exiting customize mode" into main