Reorganise navbar