Improve default markup of input component
Assure whitespace is in label