Separated the drawing onto a new page, lots of other minor tweaks