Cleaned up click handler and generic <SpecialKey> typing