App/navigation

Introduce improved app