Reworked form, modals, added alerts, other misc