Shorten the GUI stuff. I hope it is short enough for the GUIs
Merge pull request #561 from Vexatos/patch-2

Shorten the GUI stuff. I hope it is short enough for the GUIs