Changes to the login nav to make the nav more intelligent
Resolved conflicts