Added new html tags and optimized code