Sorting out highlighting issues on website