Fix scrolling issues
Merge user002