Updated the highlight algorithm to be more generic. Also did some minor tweaks like bringing the titles in and touching up the highlight CSS.