Reformat so that mobile & desktop are ordered separately