removed duplication of two messages in js and templates