merged changes, updated form and styles