Rework action button generation to allow more flexibility
Rework action button generation to allow more flexibility