Properties and repaint more integrated