Responsiveness

Small changes to responsiveness resolves #8, but also a part of #6