Merge "Fix layout so that all 4 buttons show on smaller screens." into nyc-dev