Improve labels in the app

* Clarify use of EIP
* Closes #2695