removed router
safety commit
updated navigation and page controller