Improved header.html and loader