modified views, navigation and controllers