Added tabs
Removed bootstrap switch