finished template tags & added urls