Data tabs update, less code