Fix Navigation. Show Nav menu when given ID, else Main Menu only.
formatted login pages
Merge branch 'development' into john-dev