reordered navbar stuff