Added inputs on click

Merged to Master