merge modify button and modify panels