Fix figure appearance issues