Improve labels in the app

* Clarify use of EIP
* Closes #2695
Merge remote-tracking branch 'kali/feature/improve_texts' into develop