Fix figure issue. Add figure title/labels