navbar format
consistency shit
search bar resizing
navbar looks
Merge branch 'mikey'
Merge branch 'mikey' into test-merge

Conflicts:
	phpinc/header.php
	templates/browsecategory.html
Layout Semi-Overhaul
Merge branch 'test-merge'
small nav update