Change 'set_activity' dialog; some fixes;