Continued work on inline editing