Revert "More facade removal with regards to GUI operation"

This reverts commit 4362e87f108118a8b7f6cc040578836ec8357be2.