Added author template, added more short codes