Added padding, classes some colors