WIP - edit button and safety pin