App Styling Round 1

See commit messages for more details on each commit