Added requested changes and fixed further errors in form dynamicism.