Moved input fields to Input.js