small fixes in template and cms_settings