Bug/ux mobile 18

fixes #2200