Refactor directive
Add conditional on send button