Merge branch 'develop'
Different display for smaller screen
Merge branch 'master' into develop
Make display better for res