Giving responsive some love - See #9