updated spacing and colors