Updated forms ui and working on modal