Updates to form layouts. Bug fixes in the persistence layer.