merge with Josef and nicer separation of figures and tables