Some setup additions and fix for Issue#1 - Navbar collapse