working on navigation issues