Finishing up work on edit views