Updated form layout to properly clear forms. Various fixes to datalist and persistence layer.