headerbar links

moved a few and reformated