Added navigation and page-controller