Bug/dublicate

Implementing fix for https://github.com/mesosphere/marathon/issues/324
Split this out into a function on the component instead of nested?