updates, fixed navbar, sidebar