More options to change layout and ensured repaint