fix core data model
fix toolkit views
fix view controllers