Merge pull request #143 from ni-jmatthiesen/master

Calculate scrollbar size on demand
Small fixes