Small Caret Modifications and Input Area Fix
Merge branch 'origin/master'