big bunch of changes adding propery ui