Cleaned up content.tpl