Refactoring to make the tabs more functional with more tabs on the same page and making the logic flow more "logical"