added more extensive margin classes as well as ones for padding