Mapping redesign onto the mobile device
Sorting out the merge conflict