Added boxes and changed some colors