Fixed tags not highlighting properly after matched
Updated some tag styles for better readability