Working on better property editor