Fixed JavaScript bugs with navbar
Added navbar to base view
Merged.