Responsive re-factoring, re-design