Improve the admin
2.0b9