Updates to get form Lists and Edit pages working