Features/update navigation

see in the commit descriptions what was updated