upgrade to working router; page transitions