Remove duplicate code
Expanded author.xml
Reorganizing templates. Still having some problems.