Finishing main property editor page and removing unused garbage