updated with action buttons