fix navigation and screens