Working on the navigtion