WSOTWO-117: Improved re-draw of elements