Fixed and moved highlighting