Add send modals
Some nice fixes