Reordered page creation & menu calls