Configuration of more pages
Cleanup code