[#8370465] button on top + add hidden field
[#8370465] refactor offset to trigger-template relationship