Push to modules for figure + fix figure