removed hightlight bg view at places where it looks weird
merged danqing\'s changes