Done with mobile version, only need to remake the form