Fix a bit on scrolling and change hilighting