Added tabs and tables