Refactored add to be part of the tab