Ben gui work

Fixes issue #628 and #594. 
See above comment