All demo changes from main repo
Lots of small layout changes to standardize the app elements
Merge pull request #1 from TomHAnderson/tha

All demo changes from main repo