Added template tags for messages, form and fields