Layouts updated and working; navigation is better