Make layout and wording consistent across actions