Update layout of comp, fix color choices