Removed static content from the template and added fields