Updated the edit actions and controllers