Issue #4 - further mobile fixes