Refactor for mobile landscape