Reorganize navigation bar