Hammering out responsive changes

Lots of testing ahead