Add gtk headerbar and clean up