Fixed a couple margins/padding which lost specificity during the refactor