Fixes #2225 & Fixes #2277 - ScrollView cut off at bottom

this does it