now with proper page transitions