update app.js and modals
modal update and more