diff --git a/index.html b/index.html
index 7ad167b..40a3ec2 100644
--- a/index.html
+++ b/index.html
@@ -34,15 +34,59 @@
 	</div>
 
 	<div id="tab-c-apdu" class="tab-content">
+		<div class="border border-gray-300 dark:border-slate-600 rounded p-3 bg-gray-50 dark:bg-slate-800 mb-3">
+			<div class="flex gap-3 items-end">
+				<div class="flex-1">
+					<div class="mb-2">
+						<select id="conv-type" onchange="updateConvFields()" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
+							<option value="nibswap">Nibble swap</option>
+							<option value="imsi">IMSI → EF.IMSI</option>
+							<option value="msisdn">MSISDN → BCD</option>
+							<option value="iccid">ICCID → hex</option>
+							<option value="spn">Provider Name → SPN</option>
+							<option value="plmn">MCC,MNC → PLMNsel</option>
+							<option value="plmnwact">MCC,MNC,AcT → PLMNwAcT</option>
+						</select>
+					</div>
+					<div class="flex gap-2 mb-2">
+						<input id="conv-input" class="font-mono flex-1 border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
+						<button onclick="genConvert()" class="px-3 py-1.5 bg-blue-600 text-white text-xs font-medium rounded hover:bg-blue-700" data-l10n="Convert">Convert</button>
+					</div>
+					<div id="conv-plmn-fields" class="" style="display:none">
+						<div class="flex gap-2 mb-2">
+							<div class="flex-1">
+								<input id="conv-mcc" maxlength="3" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800" placeholder="MCC">
+							</div>
+							<div class="flex-1">
+								<input id="conv-mnc" maxlength="3" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800" placeholder="MNC">
+							</div>
+						</div>
+						<div id="conv-act-row" class="" style="display:none">
+							<select id="conv-act" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
+								<option value="8000">GSM (8000)</option>
+								<option value="4000">UTRAN (4000)</option>
+								<option value="2000">E-UTRAN (2000)</option>
+								<option value="1000">NGRAN (1000)</option>
+								<option value="C000">GSM + UTRAN (C000)</option>
+								<option value="6000">UTRAN + E-UTRAN (6000)</option>
+								<option value="E000">GSM + UTRAN + E-UTRAN (E000)</option>
+								<option value="F000">All (F000)</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<textarea id="conv-result" rows="2" readonly class="flex-1 font-mono border border-gray-300 dark:border-slate-600 text-xs rounded px-2 py-1.5 bg-white dark:bg-slate-800"></textarea>
+			</div>
+		</div>
 		<div class="flex justify-center gap-2 mb-3">
-			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-blue-600 text-white" data-sub="sim" onclick="cApduSwitchSubtab('sim')">SIM</button>
-			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="usim" onclick="cApduSwitchSubtab('usim')">USIM</button>
-			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="ber" onclick="cApduSwitchSubtab('ber')">BER-TLV</button>
-			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="ram" onclick="cApduSwitchSubtab('ram')">RAM</button>
+			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-blue-600 text-white" data-sub="sim" onclick="cApduSwitchSubtab('sim')">SIM RFM</button>
+			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="usim" onclick="cApduSwitchSubtab('usim')">USIM RFM</button>
+			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="ber" onclick="cApduSwitchSubtab('ber')">Expanded BER-TLV</button>
+			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="ram" onclick="cApduSwitchSubtab('ram')">RAM/GP</button>
 		</div>
 		<div id="c-apdu-sub-sim">
 		<div class="flex gap-4 mb-3">
-			<div class="w-2/3">
+			<div class="w-full">
 				<div class="mb-3">
 					<label class="block mb-1 text-sm font-medium text-gray-700 dark:text-slate-300" data-l10n="Command">Command</label>
 					<select id="sim-cmd" onchange="updateSimUsimFields('sim')" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-3 py-2.5 dark:bg-slate-800">
@@ -155,49 +199,6 @@
 					</label>
 				</div>
 			</div>
-			<div class="w-1/3">
-				<div class="border border-gray-300 dark:border-slate-600 rounded p-3 bg-gray-50 dark:bg-slate-800">
-					<h3 class="text-sm font-medium text-gray-700 dark:text-slate-300 mb-2" data-l10n="Conversion">Conversion</h3>
-					<div class="mb-2">
-						<select id="conv-type" onchange="updateConvFields()" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
-							<option value="nibswap">Nibble swap</option>
-							<option value="imsi">IMSI → EF.IMSI</option>
-							<option value="msisdn">MSISDN → BCD</option>
-							<option value="iccid">ICCID → hex</option>
-							<option value="spn">Provider Name → SPN</option>
-							<option value="plmn">MCC,MNC → PLMNsel</option>
-							<option value="plmnwact">MCC,MNC,AcT → PLMNwAcT</option>
-						</select>
-					</div>
-					<div class="mb-2">
-						<input id="conv-input" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
-					</div>
-					<div id="conv-plmn-fields" class="" style="display:none">
-						<div class="flex gap-2 mb-2">
-							<div class="flex-1">
-								<input id="conv-mcc" maxlength="3" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800" placeholder="MCC">
-							</div>
-							<div class="flex-1">
-								<input id="conv-mnc" maxlength="3" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800" placeholder="MNC">
-							</div>
-						</div>
-						<div id="conv-act-row" class="" style="display:none">
-							<select id="conv-act" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
-								<option value="8000">GSM (8000)</option>
-								<option value="4000">UTRAN (4000)</option>
-								<option value="2000">E-UTRAN (2000)</option>
-								<option value="1000">NGRAN (1000)</option>
-								<option value="C000">GSM + UTRAN (C000)</option>
-								<option value="6000">UTRAN + E-UTRAN (6000)</option>
-								<option value="E000">GSM + UTRAN + E-UTRAN (E000)</option>
-								<option value="F000">All (F000)</option>
-							</select>
-						</div>
-					</div>
-					<button onclick="genConvert()" class="w-full mb-2 px-3 py-1.5 bg-blue-600 text-white text-xs font-medium rounded hover:bg-blue-700" data-l10n="Convert">Convert</button>
-					<textarea id="conv-result" rows="2" readonly class="w-full font-mono border border-gray-300 dark:border-slate-600 text-xs rounded px-2 py-1.5 bg-gray-100 dark:bg-slate-800"></textarea>
-				</div>
-			</div>
 		</div>
 
 		<button onclick="genSimUsim('sim')" class="mb-3 px-5 py-2.5 bg-blue-600 text-white text-sm font-medium rounded hover:bg-blue-700" data-l10n="Generate APDU">Generate APDU</button>
@@ -207,7 +208,7 @@
 
 	<div id="c-apdu-sub-usim" class="hidden">
 		<div class="flex gap-4 mb-3">
-			<div class="w-2/3">
+			<div class="w-full">
 				<div class="mb-3">
 					<label class="block mb-1 text-sm font-medium text-gray-700 dark:text-slate-300" data-l10n="Command">Command</label>
 					<select id="usim-cmd" onchange="updateSimUsimFields('usim')" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-3 py-2.5 dark:bg-slate-800">
@@ -320,49 +321,6 @@
 					</label>
 				</div>
 			</div>
-			<div class="w-1/3">
-				<div class="border border-gray-300 dark:border-slate-600 rounded p-3 bg-gray-50 dark:bg-slate-800">
-					<h3 class="text-sm font-medium text-gray-700 dark:text-slate-300 mb-2" data-l10n="Conversion">Conversion</h3>
-					<div class="mb-2">
-						<select id="conv-type" onchange="updateConvFields()" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
-							<option value="nibswap">Nibble swap</option>
-							<option value="imsi">IMSI → EF.IMSI</option>
-							<option value="msisdn">MSISDN → BCD</option>
-							<option value="iccid">ICCID → hex</option>
-							<option value="spn">Provider Name → SPN</option>
-							<option value="plmn">MCC,MNC → PLMNsel</option>
-							<option value="plmnwact">MCC,MNC,AcT → PLMNwAcT</option>
-						</select>
-					</div>
-					<div class="mb-2">
-						<input id="conv-input" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
-					</div>
-					<div id="conv-plmn-fields" class="" style="display:none">
-						<div class="flex gap-2 mb-2">
-							<div class="flex-1">
-								<input id="conv-mcc" maxlength="3" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800" placeholder="MCC">
-							</div>
-							<div class="flex-1">
-								<input id="conv-mnc" maxlength="3" class="font-mono w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800" placeholder="MNC">
-							</div>
-						</div>
-						<div id="conv-act-row" class="" style="display:none">
-							<select id="conv-act" class="w-full border border-gray-300 dark:border-slate-600 text-sm rounded px-2 py-1.5 dark:bg-slate-800">
-								<option value="8000">GSM (8000)</option>
-								<option value="4000">UTRAN (4000)</option>
-								<option value="2000">E-UTRAN (2000)</option>
-								<option value="1000">NGRAN (1000)</option>
-								<option value="C000">GSM + UTRAN (C000)</option>
-								<option value="6000">UTRAN + E-UTRAN (6000)</option>
-								<option value="E000">GSM + UTRAN + E-UTRAN (E000)</option>
-								<option value="F000">All (F000)</option>
-							</select>
-						</div>
-					</div>
-					<button onclick="genConvert()" class="w-full mb-2 px-3 py-1.5 bg-blue-600 text-white text-xs font-medium rounded hover:bg-blue-700" data-l10n="Convert">Convert</button>
-					<textarea id="conv-result" rows="2" readonly class="w-full font-mono border border-gray-300 dark:border-slate-600 text-xs rounded px-2 py-1.5 bg-gray-100 dark:bg-slate-800"></textarea>
-				</div>
-			</div>
 		</div>
 
 		<button onclick="genSimUsim('usim')" class="mb-3 px-5 py-2.5 bg-blue-600 text-white text-sm font-medium rounded hover:bg-blue-700" data-l10n="Generate APDU">Generate APDU</button>
diff --git a/style.css b/style.css
index bf019ca..21bbffa 100644
--- a/style.css
+++ b/style.css
@@ -707,10 +707,6 @@ video {
   width: 4rem;
 }
 
-.w-2\/3 {
-  width: 66.666667%;
-}
-
 .w-20 {
   width: 5rem;
 }
@@ -793,6 +789,10 @@ video {
   align-items: flex-start;
 }
 
+.items-end {
+  align-items: flex-end;
+}
+
 .items-center {
   align-items: center;
 }