Refactor for mobile-first