moved elements on nav, removed lingering bootstrap references