Add improvments to input and form