Fixing tabs

fixed the tabs and made the first tab load automatically
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/master' into gh-pages