Lot's of UX enhancements

added highlight selector as an argument