Updated UI for admin, fixes