Improve caret positioning and add blinker