Dialog flicker fixed and issue with update when model is not valid is fixed.