Refactor tabd pages out to normal pages