reworked navigation, missing functionality