add tabs for data and checks some bugs