Removed underline from highlight and a few other things