reformatted and added additional margin and padding mixins