Changed Nav Bar / Display
Merge branch 'interfaceOrSomething'

Conflicts:
	templates/display.php