lots of layout done

Some more layout, going to edit a few bits though.