Added mutliple view options on welcome page.
Cleanup navigation bar.
Fixed failed test.