More work on edit activity