orientation & redrawing fixed