Changed behaivor of some scaling when scrolling and changing the aggregation factor.
Clean up imports/syntax