Several fixes for admin ui