added alert modals and fixed signin message
cleaning up
fixing merge conflicts