Improved textbox
Merge remote-tracking branch 'origin/master'
Added textbox functionality back into textbox