Couple more tweaks

I like clean category and action names. Also fixed up the push into the
dataLayer.