Improved text input functionality
Resolved merge conflicts