Restructured for other Pages and transitions