Add click actions and dialogs
Better dialogs