Fixed docking on right and highlighting issues.