Some mobile adjustments

partially rework of #1476