Merge branch 'haziel-nav' into Zach-nav

Merge haziel-nav for LoginPage controllers.