With Adding TabView function