Starting to reorganize UI logic for mobile