Updated layout module. Improved nav.