Back to the old layout

Minor design and implementation changes