Added more model creation/listing views.
Fix merge conflicts.