Fix page stack pushing on various pages