Redo layout, content only, no control.
Add viewer shuffle. Re-enable viewer. Add wall entrance. Fine tune save.