Added more elements, starting on validation for first page