Fixes #22
Started things for expert view :) #29
Minor improvements to property template