Revert "Revert "gui changes""

This reverts commit 141b2d88bb168056a30fc8258ac3f3029ba67d83.

Revert "gui changes"

This reverts commit
54367c2a9d7915f46f1f287959ef979a1d61975c.