Improved UI in admin