Adds modal for proposals
Fixes merge conflicts