adding tabs, and alternating views
Merge branch 'approuter'