Concept properties dialog functionality improved but still not finished
Conflict resolving commit.