Manually merging CCoffie's changes to test Sugar3 implementation and bugfixes to GUI components.