Added styling
Move cursor to end on focus
Merge branch 'dev'