Gui changes ported from lanse's PR #104

Closed Buuz135 closed 2 years ago