added 'Figure' working 'Tabs' etc