GUI interactions clean-up (and edge cases)