Cleanup
More cleanup, added PNGs of layout
Cleanup