edited input fields
Merge branch 'working'
gulped