Switch over to individual classes for padding