clean up and connecting the tab bar flows

clean up and connecting the tab bar flows