Layout navbar
Merge branch 'source'

Conflicts:
	index.html
Actually merge source first!