[Majd/Ravish] Added tabs
Merging