First steps toward mobile ready
Merge branch 'mobile'