refactor the wrappers and remove the tabs