update template and style a bit