Reworked guiheaders