Revision B of Container Layout.

This layout includes windows. It has a seperate server room.