fixed up nav bar and layout