Reworking the headerbar