         case .cellLeading:
             origin.x = topLabelPadding.left
         case .cellCenter:
-            origin.x = cellFrame.midX + topLabelPadding.left - topLabelPadding.right
-        case .cellTrailing:
-            origin.x = cellFrame.maxX - topLabelSize.width - topLabelPadding.right
+            origin.x = (cellFrame.width/2) + topLabelPadding.left - topLabelPadding.right
+        case .cellTrailing:
+            origin.x = cellFrame.width - topLabelSize.width - topLabelPadding.right
         case .messageLeading:
             origin.x = messageContainerFrame.minX + topLabelPadding.left
         case .messageTrailing:

        case .cellLeading:
            origin.x = bottomLabelPadding.left
        case .cellCenter:
            origin.x = cellFrame.midX + bottomLabelPadding.left - bottomLabelPadding.right
        case .cellTrailing:
            origin.x = cellFrame.maxX - bottomLabelSize.width - bottomLabelPadding.right
        case .messageLeading:
            origin.x = messageContainerFrame.minX + bottomLabelPadding.left
        case .messageTrailing:

        case .cellTop:
            break
        case .cellBottom:
            origin.y = cellFrame.height - avatarSize.height
        case .messageTop:
            origin.y = messageContainerFrame.maxY
        case .messageBottom:
