change the order of the date and time settings
tidy up the combined system menu mockups