modify page transitions to be more robust
modify page transitions to be more robust