Added Bootstrap theme, re-tabbed code