Refactor and add my tab