Several changes in admin module