layout

Got most of the layout adapted to the new system.
layout