Modified alot the administration forms to be more DRY.