progress on FormDataDana and component redesign