refactor quick add modal
Modularize the modals