Fixing indexing of elements, still have problems with forms and persisted?