fixing input form - all done except for user ID and second partial form
fixed input.rb for merge conflict