Update urls and add more beautiful templates