Added nav control
Changed navigation