Figure formatting.
Fix merge conflicts. Check its not messed up.