All pages work and fine. Let's do a little structuring, refactoring.