Mobile layout improvements by @ymaz