Added Action UI and dirty checker