add input class, to be read from in view.
fix merge conflicts.