Revert "some GUI layout changes"

This reverts commit 2a8e2e8b295fdc27dcde00c40dba6c208f546a5c.