UI and diagram changes