hmmm… still some leftover issues
Some tweaks to edit screen, etc.
cleaned up the room show screen