Improve the HTML layout
Version 0.2