Merge "Give the AM/PM buttons slightly more content area" into nyc-dev