Updated forms so that field sizes are correct and included input masks