Fix resize ajustment
Added highlight support
Added highlight support