added navigation and layouts.