Changed labelling and margins

Labels are not produced on every plot any more, as there was a lot of redundancy - looks tidier now