Fixed template, titles and some other stuff