This can only be worked on after #742 is merged

Current <img width="385" alt="image" src="https://user-images.githubusercontent.com/13184582/234307858-0b29e165-79be-4ed0-8459-a5045ade2674.png">

Figma <img width="385" alt="image" src="https://user-images.githubusercontent.com/13184582/234308048-b54b0aff-0408-4180-a7dc-3fde2f1af650.png">