The form is kinda messed up so should do some updates