Reverted to old edit view on master, branched new one