Fixed small issue
Added template administration (WIP)