add more details to model state
remove diagram view and controller, fix model controller