Fixing error with pages
Impoving UI
Merge branch 'test'

Conflicts:
	index.php