fixed problem with scroll not appearing when the content of the tb is bigger than the screen height
Merge branch 'design' into gh-pages