Fixes + disabled property windows as they were using a lot of CPU