Gui code is now somewhat more readable