added navigation service, added notification service, cleaned up navigation and controllers