Form Design Changes and Search Fix