Improved edit flow; fixed occasional blank edit list view