UI Improvements - Admin - Cleanup #194