Revert "Polishing/normalizing new GUI"

This reverts commit 5020c7a73ed2352656a7cab4ccfb621854f6582b.
Merge pull request #6527 from pchote/revert-6518

Revert "Polishing/normalizing new GUI"