Added edit option (not fully implemented)