Still cleaning up CRUD forms/lists