Scrollbars shown only if required

And where they are required.