fix renaming issues
put editing UIs behind a toggle