Added admin unit management features
merge after pull
fix web config