Huge overhaul of navbar and sidebar