#958 Adding tabs