Revert "Updates to GUI"

This reverts commit 202905384955aa1a2554da02f28deb85dda1bea5.
Revert "Revert "Updates to GUI""

This reverts commit 7aeabfa5ea35738031e32017059af6840f521834.