Try and improve responsiveness, tweak green higlight