Fixing problems with composition and GUI.