Move the headerbar back in place

Don't rely on glade support, just do it in code for now.