UI Improvements - Admin - Updates #194