[#5599] Fixed and cleaned up nav-bar selection logic

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>
2 files changed