Created consistent form, some progress in functionality.