Fixed Linebreak issues in templates