Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc2b71cdf84febca251700488647c001604ba2e7b -rbbea4a2a607ed759bc283c75623c0e3f9a8c066c
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c2b71cdf84febca251700488647c001604ba2e7b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bbea4a2a607ed759bc283c75623c0e3f9a8c066c)
@@ -344,7 +344,7 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE;
-    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( F32 ) + sizeof( U32 ) + sizeof( F32 ) + sizeof( U32 ) + sizeof (F32 );
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( F32 ) + sizeof( U32 ) + sizeof( U32 ) + sizeof( F32 ) + sizeof ( F32 );
 
     memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
     payloadPtr += sizeof( BOOL );
@@ -354,10 +354,10 @@
     payloadPtr += sizeof( F32 );
     memcpy( payloadPtr, &time_min, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &ufRate_mL_min, sizeof( F32 ) );
-    payloadPtr += sizeof( F32 );
     memcpy( payloadPtr, &timeDiff, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &ufRate_mL_min, sizeof( F32 ) );
+    payloadPtr += sizeof( F32 );
     memcpy( payloadPtr, &rateDiff, sizeof( F32 ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rc2b71cdf84febca251700488647c001604ba2e7b -rbbea4a2a607ed759bc283c75623c0e3f9a8c066c
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision c2b71cdf84febca251700488647c001604ba2e7b)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision bbea4a2a607ed759bc283c75623c0e3f9a8c066c)
@@ -32,6 +32,8 @@
 void handleDGCheckIn( MESSAGE_T *message );
 // MSG_ID_UI_CHECK_IN
 void handleUICheckIn( MESSAGE_T *message );
+// MSG_ID_REQUEST_FW_VERSIONS
+void handleFWVersionRequest( MESSAGE_T *message );
 
 // MSG_ID_OFF_BUTTON_PRESS
 BOOL sendOffButtonMsgToUI( U08 cmd );
@@ -77,9 +79,6 @@
 // MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS
 BOOL sendDialysateTempTargetsToDG( F32 primary, F32 trimmer );
 
-// MSG_ID_REQUEST_FW_VERSIONS
-void handleFWVersionRequest( MESSAGE_T *message );
-
 // MSG_ID_DG_OP_MODE:
 void handleDGOpMode( MESSAGE_T *message );