Revert "Revert "b.1.5.1 Minor Fixes, Initial Mobile Support""

This reverts commit e629b943e53ffbec979a9be3a2459fc7cede58c8.