More facade removal with regards to GUI operation