UI improvements
Merge branch 'master' of https://github.com/TomTom101/MacRefurbishedShop

Conflicts:
	app/views/Page1/index.html