Updated the layout. This is a working copy.