closes #60 (closed)
Rearrange plotting to fill up the whole figure. Currently not all things in correct position