Added better init repaint behaviour