Updating Builder and Control to handle styled States