Entity Tools - Properties window, Tool window, Various fixes