improve format (look&feel) inside templates