Final updates before color & mailchimp integration