Finish static_pages refactorization