Add button to bundle and reorganize how it work section