Clean up code in Labeller and UpdateLabeller

[sonalgoyal]

Right now there is a lot of repeat code in the labeller and update labeller classes - for ex execute method could be in one place. Code is pretty hard to maintain too, as the model is tied to the display. need to clean this.