Re-ordered the border mixins