More front page modularization