Improve layout.
Improvements.
Bug in Jade template.