Update of UI and new Navigation