Thinking we need to adapt the UI a little bit to something like this