fixed navbar, made links and organised controllers