Better highlighting and selection