Adding some more demos and updates for tabs