fix app navigation

toolbar management