Updated the views for consistency in color schemes and layouts
Merge branch 'master' of https://github.com/dgrant069/Grubly
Merge branch 'nick'