Added admin console
Fixed conflicts