Fix the bus type choice
Change the TabView for a StackView