Margin fixes
Merge branch 'master' of https://github.com/Crisp-EE/crisp