adds better auto populating of property label in form
compiles last commit