Modify some description about yucato
Fix broken HTML table
Resolve conflict