Improvements in Admin UI