some minor code cleanup; added ordering of properties in management panel