Demo improvements
Added dynamic tabs