reworked navigation expansion