responsive + refactor