Updates to form layout. Fixed handling of checkbox values and toggling between edit and view modes.