Fix overflow problem introduced in the #406 bugfix (scrolling is missing)
Merge branch 'develop' of https://github.com/hypothesis/h into 409-thomas-gov-bugfix