Remove old edit button, rename activities