Responsive fixes [closes #22]