Convert to using data layer.

Hi Sarah,
(Yes, I'm on paternity leave!)
Here's what it would look like using data layer. What do you think?
Unfortunately I had to move things around a little, which makes it look like there are more changes than there really are.
Stephen