added scoll bar
merge commit