still trying to fix bug in highlighting after review/settings