rearranged navbar