Feature/clean up

This PR changes the following:

- Let the view decide when it want to communicate with the client. 
- Adjust wording depending on the endpoint.