thematic plan confirmation dialog + small fixes