Mobile: rework layout