simplify interface for tablets and phones
Merge remote-tracking branch 'origin/master'