Project 3 -- Fixed Navigation