Refactoring + repsonsive