almost final version of navigation