Fixes and cleanup

What the hell was that overflow scroll doing there.