Reorganize default layout to optimize page load speed