Added action buttons
Cosmetic fixes for action buttons
Cosmetic modifications