Updated admin and routing