fixed scrollbar problem
Merge branch 'julia' into testing