Rearrange site config
Template changes for comments and site settings