Update Stage 6 spacing and color issues