Clean up formatting of layout files.
Change Calendar.HOUR_OF_DAY to Calendar.HOUR to use a 12-hour time.