Improvements on admin interface