Added repaint to mouseclick event
Fixed merging conflict