Added missing first page and refactored a touch