tabs now scale beautifully
Merge branch 'capright' into testing