Some changes, scrollbar fixes

Signed-off-by: bergerkiller <bergerkiller@gmail.com>