Adding tabs improved