Revert to original room form, improve room edit