fixed highlighting issue and firefox clipping