Mobile support and HTML cleanup
pull merge