Scrollbar improvement - #10