I was hoping to make this a more front-end focused PR, I tried my best to avoid unnecessary refactorings :wink: