Fix Retina size
Merge branch 'design'