The redesign of both rooms is done. I have thrown the earlier concept of the last room in the trash with the cracked ceiling and the water floor and replaced it with a bigger area.
New:

Old:

Now it goes next to some more decoration and everything else (texture alignments, lighting, bot pathing, item placements etc.).