Removed last references to Controller GUI.

Improved the code in the blocks too.