fixing comments, hiding notification template