Figure improvements