Fixed bugs in single page layout