FEATURE Client & Property Form tidy