Navigation Panel rework