Improved the html's layout