Hardened the button / input optional classes stuff