fixed navbar, fixed controller issues