code cleanup / reorganisation: fixed layout page transitions