Now considers scrollbar width to avoid ugly wrapping