Fixed spacing on setting screen
Merge branch 'develop'