Navbar change

Moved Navbar from top to bottom.
Merge remote-tracking branch 'origin/master' into master-test