GUI: Misc cleanups for abstraction after refactoring (consitency)