Fix wrong url path
Added support for own template