Fixed the scaling in View, though one test started to fail. To be fixed.