CRUD Organization. Some problem views fix