Rework navigation elements