Scroller fixed
Merged with pranavashok