added contacts, modals and some screen flow