fixed some border highlight issues