Clean up figures and improve figure links