AMEC-1853: Figure drawer display