App navigation fix