refactored screens navigation