Revert 39f880f..13f4afc

This rolls back to commit 39f880fdb0dfe0b74e16ea4af770bd4af30bca8e.
Revert 13f4afc..b0d9350

This rolls back to commit 13f4afc48072562929682f38b669abff6990c671.
Fixed GUI