Responsive fixes after refactor