Improve performance of action buttons