Moified page transition logic to be more agnostic