Continuing the migration to the new view/controller framework