Working on navigation control