Better import: Expend templates, better url handeling and internal links