[BugFix] #874.

The problem was in wrong order of UI updates: the text was updating __after__ the size of marker.
Minor clean up of marker's code.