Adding admin section, changes for new template system