reworked navigation