Added and updated modal fix for repaint