Tidy up

Remove the old code based on mfrow.
Attempt to add text labels to plots.