Fix buttons in header + new GCMS