Changes to Scatter layout (idea adapted from Vishen's changes)