Migrating layout logic to page rather than in modules
Adding address window to extras