Worked a little bit on the layout