Added theming to the app, additionally started working around certain aspects of the layout to get it ready for design to implement