Added tabbed sections.
Merge branch 'feature-tabs'