Revert "Aesthetic changes to GUI"

This reverts commit e008792e6ebd7e1314a69224f7e82b57e88975c6.
Revert "Revert "Aesthetic changes to GUI""

This reverts commit 5bfcb52ded07b087513f1e66737fed193fa5ffb5.