Fix some issues with tabs
Add tabs to the demo