Removed highlight and added some classes