Update layout, use lighter/friendlier colors