Viewport size 480x320px
Solved conflicts after merge