Fixes for extra YAML pages

## Fixes
- [x] Make pages appear in order they are in the YAML file
- [ ] Make competition edit form for pages work properly