Lots of small layout changes to standardize the app elements