Removed 12/24 hour time format option, will use system wide setting
Changed to merge
Changed "fill_parent" to "match_parent"