redrawing fixes, borders etc.