first 3 items are now completed by defaut
Merge remote-tracking branch 'remotes/upstream/master'
Make UI resize a little better to support more devices