UI fixes
Merge branch 'master' of https://github.com/LohDownVideos/TheFreeStore

Conflicts:
	client/main-page.js