Added some more optimizations to page layout