Improved highlighting and added keyboard shortcuts for wrapping