Responsive work plus a couple of tweaks