Wip/modals

I'll take another look at it to see why they're added in this PR. I also had the same reaction to it.