Merge layout/front-page branch