fixes voor the navigation, performance and usability improvements