Refactor responsive 6