changed input fields for buttons
Merge branch 'dev' into servlet2