Re-arranging pages, adding calendar selector