Added input classes
Conflicts resolved