improved templates and css (pb w result)