Merge pull request #53 from Cynaria/spacing_adjustments

Spacing adjustments
more spacings
Merge branch 'master' into spacing_adjustments