changed some colors and margin