Adjusting templates
Improving layout structure
Improving index template structure