Issue #60 improvements on mobile support