rework navigation