Improved action button handling