removed obsolete code
improved labelling of tabs