Decouple logo and main nav so it is easy to override if needed
Move register and password buttons
Remove redundant links
Replace missing @
Access tweak
Fixes  #176
Merge pull request #177 from LearningLocker/develop

Develop