Improve figures