new layout, html code improvements...