Couple of performance fixes - eliminate un-necessary redraws and preview updating