Changed back to nested templates.
Minor bbs and channel fixes.