Building upon Justin's improvements to the look and feel of the app

See commits for changes