New layout

Almost done.