GUI refinement (in progress) and EventSupport fixes