New changes for controllers, navbar.jsp and so on