Improved mobile support

.