IDE-1425 Reviewed UX and added 2 actions instead of just one