Still fixing template
Merge branch '0.2.x'
</div> -> </ul>
Merge branch '0.2.x'