Improvements to admin on components