Fixing property screen shit and refactoring codezzz