refactored textField, moved to inputField method to handle append - prepend
Merge remote-tracking branch 'origin/master'