UI Improvements - Admin - updates #194