Another major update. Changes to edit and transfer views