fix: modal popup should be grouped with toggle button (#40)

fix: modal popup should be grouped with toggle button (#40) #34