Changed to non-escaping layout