Feature/ui

- [x]  finish the code
- [ ]  gather feedback for my changes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| Tests pass?   | none
| Fixed tickets | none
| Doc           | none