rearrange navbar, add implementations