Technical Code Review: Mobile Device Usage

Improve mobile usage

From #70 (comment 180015)