Some more changes to mobile markup. Relatively hacky so will require refactoring later.