Removed some debug stuff
Atempt to fix the scrollbar
Merge branch 'origin/1.0.4b'