GUI update

Tabbed GUI
Revert "GUI update"

This reverts commit 265032ffb23e6146493073241b30503a08881036.
Revert "Revert "GUI update""

This reverts commit 55c1c4f0f7d5fb3d148e33b62fffa168e0a655cf.