Properly include demo-tab in common elemets import