Refactor modal view to be easier to navigate
Rebuild dist