Presentation and diagram updates
cleanup