Last amends and beautify html/css