Adding some nav buttons and removing debug code