More fix for one page layout