Add styling, update views and make minor tweaks