Round 21

Changes for top navigation bar.