diff --git a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
index 1c197196..f52f20e7 100644
--- a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
+++ b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
@@ -12,7 +12,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.background
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -73,6 +72,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
@@ -692,8 +692,23 @@ fun ModuleItem(
     onUpdate: (ModuleViewModel.ModuleInfo) -> Unit,
     onClick: (ModuleViewModel.ModuleInfo) -> Unit,
 ) {
+    val viewModel = viewModel<ModuleViewModel>()
+
     ElevatedCard(
-        modifier = Modifier.fillMaxWidth()
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(MaterialTheme.shapes.medium)
+            .clickable(
+                enabled = (module.enabled && !module.remove && (module.hasWebUi || module.hasActionScript)),
+                onClick = {
+                    if (module.hasWebUi) {
+                        onClick(module)
+                    } else if (module.hasActionScript) {
+                        navigator.navigate(ExecuteModuleActionScreenDestination(module.dirId))
+                        viewModel.markNeedRefresh()
+                    }
+                }
+            )
     ) {
         Box(
             modifier = Modifier
@@ -705,7 +720,7 @@ fun ModuleItem(
 
             val useBanner = prefs.getBoolean("use_banner", true)
 
-            if (useBanner && !useLagacyUI && module.banner.isNotEmpty()) {
+            if (useBanner && module.banner.isNotEmpty()) {
                 val isDark = isSystemInDarkTheme()
                 val colorScheme = MaterialTheme.colorScheme
                 val context = LocalContext.current
@@ -778,8 +793,6 @@ fun ModuleItem(
             Column {
                 val textDecoration = if (!module.remove) null else TextDecoration.LineThrough
                 val interactionSource = remember { MutableInteractionSource() }
-                val indication = LocalIndication.current
-                val viewModel = viewModel<ModuleViewModel>()
 
                 var developerOptionsEnabled by rememberSaveable {
                     mutableStateOf(
@@ -791,487 +804,271 @@ fun ModuleItem(
                     developerOptionsEnabled = prefs.getBoolean("enable_developer_options", false)
                 }
 
-                if (useLagacyUI) {
-                    Column(
-                        modifier = Modifier
-                            .padding(22.dp, 18.dp, 22.dp, 12.dp)
+                Column(
+                    modifier = Modifier
+                        .padding(22.dp, 18.dp, 22.dp, 12.dp)
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
                     ) {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween,
+                        val moduleVersion = stringResource(id = R.string.module_version)
+                        val moduleAuthor = stringResource(id = R.string.module_author)
+                        val moduleId = stringResource(id = R.string.module_id)
+                        val moduleVersionCode = stringResource(id = R.string.module_version_code)
+                        val moduleUpdateJson = stringResource(id = R.string.module_update_json)
+                        val moduleUpdateJsonEmpty = stringResource(id = R.string.module_update_json_empty)
+
+                        Column(
+                            modifier = Modifier.fillMaxWidth(0.8f)
                         ) {
-                            val moduleVersion = stringResource(id = R.string.module_version)
-                            val moduleAuthor = stringResource(id = R.string.module_author)
-                            val moduleId = stringResource(id = R.string.module_id)
-                            val moduleVersionCode = stringResource(id = R.string.module_version_code)
-                            val moduleUpdateJson = stringResource(id = R.string.module_update_json)
-                            val moduleUpdateJsonEmpty = stringResource(id = R.string.module_update_json_empty)
-
-                            Column(
-                                modifier = Modifier.fillMaxWidth(0.8f)
-                            ) {
-                                Text(
-                                    text = module.name,
-                                    fontSize = MaterialTheme.typography.titleMedium.fontSize,
-                                    fontWeight = FontWeight.SemiBold,
-                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                    fontFamily = MaterialTheme.typography.titleMedium.fontFamily,
-                                    textDecoration = textDecoration,
-                                )
-
-                                Text(
-                                    text = "$moduleVersion: ${module.version}",
-                                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                    textDecoration = textDecoration
-                                )
-
-                                Text(
-                                    text = "$moduleAuthor: ${module.author}",
-                                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                    textDecoration = textDecoration
-                                )
-
-                                if (developerOptionsEnabled) {
-
-                                    Text(
-                                        text = "$moduleId: ${module.id}",
-                                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                        lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                        textDecoration = textDecoration
-                                    )
-
-                                    Text(
-                                        text = "$moduleVersionCode: ${module.versionCode}",
-                                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                        lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                        textDecoration = textDecoration
-                                    )
-
-                                    Text(
-                                        text = if (module.updateJson.isNotEmpty()) "$moduleUpdateJson: ${module.updateJson}" else "$moduleUpdateJson: $moduleUpdateJsonEmpty",
-                                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                        lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                        textDecoration = textDecoration
-                                    )
-                                }
-                            }
-
-                            Spacer(modifier = Modifier.weight(1f))
-
                             Row(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.End,
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = Arrangement.spacedBy(6.dp)
                             ) {
-                                Switch(
-                                    enabled = !module.update,
-                                    checked = module.enabled,
-                                    onCheckedChange = onCheckChanged,
-                                    interactionSource = if (!module.hasWebUi) interactionSource else null
+                                LabelItem(
+                                    text = formatSize(module.size),
+                                    style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
+                                        containerColor = MaterialTheme.colorScheme.secondaryContainer,
+                                        contentColor = MaterialTheme.colorScheme.onSecondaryContainer
+                                    )
                                 )
-                            }
-                        }
-
-                        Spacer(modifier = Modifier.height(12.dp))
-
-                        Text(
-                            text = module.description,
-                            fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                            fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                            lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                            fontWeight = MaterialTheme.typography.bodySmall.fontWeight,
-                            overflow = TextOverflow.Ellipsis,
-                            maxLines = 4,
-                            textDecoration = textDecoration
-                        )
-
-                        Spacer(modifier = Modifier.height(16.dp))
-
-                        HorizontalDivider(thickness = Dp.Hairline)
-
-                        Spacer(modifier = Modifier.height(4.dp))
-
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            if (module.hasActionScript) {
-                                FilledTonalButton(
-                                    modifier = Modifier.defaultMinSize(52.dp, 32.dp),
-                                    enabled = !module.remove && module.enabled,
-                                    onClick = {
-                                        navigator.navigate(ExecuteModuleActionScreenDestination(module.dirId))
-                                        viewModel.markNeedRefresh()
-                                    },
-                                    contentPadding = ButtonDefaults.TextButtonContentPadding
-                                ) {
-                                    Icon(
-                                        modifier = Modifier.size(20.dp),
-                                        imageVector = Icons.Outlined.PlayArrow,
-                                        contentDescription = null
-                                    )
-                                    if (!module.hasWebUi && updateUrl.isEmpty()) {
-                                        Text(
-                                            modifier = Modifier.padding(start = 7.dp),
-                                            text = stringResource(R.string.action),
-                                            fontFamily = MaterialTheme.typography.labelMedium.fontFamily,
-                                            fontSize = MaterialTheme.typography.labelMedium.fontSize
+                                LabelItem(
+                                    text = if (module.enabled) stringResource(R.string.enabled) else stringResource(R.string.disabled),
+                                    style = if (module.enabled)
+                                        com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy()
+                                    else
+                                        com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
+                                            containerColor = MaterialTheme.colorScheme.errorContainer,
+                                            contentColor = MaterialTheme.colorScheme.onErrorContainer
                                         )
-                                    }
-                                }
-
-                                Spacer(modifier = Modifier.weight(0.1f, true))
-                            }
-
-                            if (module.hasWebUi) {
-                                FilledTonalButton(
-                                    modifier = Modifier.defaultMinSize(52.dp, 32.dp),
-                                    enabled = !module.remove && module.enabled,
-                                    onClick = { onClick(module) },
-                                    interactionSource = interactionSource,
-                                    contentPadding = ButtonDefaults.TextButtonContentPadding
-                                ) {
-                                    Icon(
-                                        modifier = Modifier.size(20.dp),
-                                        imageVector = Icons.AutoMirrored.Outlined.Wysiwyg,
-                                        contentDescription = null
-                                    )
-                                    if (!module.hasActionScript && updateUrl.isEmpty()) {
-                                        Text(
-                                            modifier = Modifier.padding(start = 7.dp),
-                                            fontFamily = MaterialTheme.typography.labelMedium.fontFamily,
-                                            fontSize = MaterialTheme.typography.labelMedium.fontSize,
-                                            text = stringResource(R.string.open)
-                                        )
-                                    }
-                                }
-                            }
-
-                            Spacer(modifier = Modifier.weight(1f, true))
-
-                            if (updateUrl.isNotEmpty()) {
-                                Button(
-                                    modifier = Modifier.defaultMinSize(52.dp, 32.dp),
-                                    enabled = !module.remove,
-                                    onClick = { onUpdate(module) },
-                                    shape = ButtonDefaults.textShape,
-                                    contentPadding = ButtonDefaults.TextButtonContentPadding
-                                ) {
-                                    Icon(
-                                        modifier = Modifier.size(20.dp),
-                                        imageVector = Icons.Outlined.Download,
-                                        contentDescription = null
-                                    )
-                                    if (!module.hasActionScript || !module.hasWebUi) {
-                                        Text(
-                                            modifier = Modifier.padding(start = 7.dp),
-                                            fontFamily = MaterialTheme.typography.labelMedium.fontFamily,
-                                            fontSize = MaterialTheme.typography.labelMedium.fontSize,
-                                            text = stringResource(R.string.module_update)
-                                        )
-                                    }
-                                }
-
-                                Spacer(modifier = Modifier.weight(0.1f, true))
-                            }
-
-                            if (module.remove) {
-                                FilledTonalButton(
-                                    modifier = Modifier.defaultMinSize(52.dp, 32.dp),
-                                    onClick = { onRestore(module) },
-                                    contentPadding = ButtonDefaults.TextButtonContentPadding
-                                ) {
-                                    Icon(
-                                        modifier = Modifier.size(20.dp),
-                                        imageVector = Icons.Outlined.Restore,
-                                        contentDescription = null
-                                    )
-                                    if (!module.hasActionScript && !module.hasWebUi && updateUrl.isEmpty()) {
-                                        Text(
-                                            modifier = Modifier.padding(start = 7.dp),
-                                            fontFamily = MaterialTheme.typography.labelMedium.fontFamily,
-                                            fontSize = MaterialTheme.typography.labelMedium.fontSize,
-                                            text = stringResource(R.string.restore)
-                                        )
-                                    }
-                                }
-                            } else {
-                                FilledTonalButton(
-                                    modifier = Modifier.defaultMinSize(52.dp, 32.dp),
-                                    enabled = true,
-                                    onClick = { onUninstall(module) },
-                                    contentPadding = ButtonDefaults.TextButtonContentPadding
-                                ) {
-                                    Icon(
-                                        modifier = Modifier.size(20.dp),
-                                        imageVector = Icons.Outlined.Delete,
-                                        contentDescription = null
-                                    )
-                                    if (!module.hasActionScript && !module.hasWebUi && updateUrl.isEmpty()) {
-                                        Text(
-                                            modifier = Modifier.padding(start = 7.dp),
-                                            fontFamily = MaterialTheme.typography.labelMedium.fontFamily,
-                                            fontSize = MaterialTheme.typography.labelMedium.fontSize,
-                                            text = stringResource(R.string.uninstall)
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    Column(
-                        modifier = Modifier
-                            .padding(22.dp, 18.dp, 22.dp, 12.dp)
-                    ) {
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            horizontalArrangement = Arrangement.SpaceBetween
-                        ) {
-                            val moduleVersion = stringResource(id = R.string.module_version)
-                            val moduleAuthor = stringResource(id = R.string.module_author)
-                            val moduleId = stringResource(id = R.string.module_id)
-                            val moduleVersionCode = stringResource(id = R.string.module_version_code)
-                            val moduleUpdateJson = stringResource(id = R.string.module_update_json)
-                            val moduleUpdateJsonEmpty = stringResource(id = R.string.module_update_json_empty)
-
-                            Column(
-                                modifier = Modifier.fillMaxWidth(0.8f)
-                            ) {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    horizontalArrangement = Arrangement.spacedBy(6.dp)
-                                ) {
+                                )
+                                if (module.remove) {
                                     LabelItem(
-                                        text = formatSize(module.size),
+                                        text = stringResource(R.string.uninstalled),
                                         style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
-                                            containerColor = MaterialTheme.colorScheme.secondaryContainer,
-                                            contentColor = MaterialTheme.colorScheme.onSecondaryContainer
+                                            containerColor = MaterialTheme.colorScheme.errorContainer,
+                                            contentColor = MaterialTheme.colorScheme.onErrorContainer
                                         )
                                     )
+                                }
+                                if (updateUrl.isNotEmpty() && !module.remove && !module.update) {
                                     LabelItem(
-                                        text = if (module.enabled) stringResource(R.string.enabled) else stringResource(R.string.disabled),
-                                        style = if (module.enabled)
-                                            com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy()
-                                        else
-                                            com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
-                                                containerColor = MaterialTheme.colorScheme.errorContainer,
-                                                contentColor = MaterialTheme.colorScheme.onErrorContainer
-                                            )
-                                    )
-                                    if (module.remove) {
-                                        LabelItem(
-                                            text = stringResource(R.string.uninstalled),
-                                            style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
-                                                containerColor = MaterialTheme.colorScheme.errorContainer,
-                                                contentColor = MaterialTheme.colorScheme.onErrorContainer
-                                            )
+                                        text = stringResource(R.string.module_update),
+                                        style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
+                                            containerColor = MaterialTheme.colorScheme.onTertiary,
+                                            contentColor = MaterialTheme.colorScheme.onTertiaryContainer
                                         )
-                                    }
-                                    if (updateUrl.isNotEmpty() && !module.remove && !module.update) {
+                                    )
+                                }
+                                if (!module.remove) {
+                                    if (module.update) {
                                         LabelItem(
-                                            text = stringResource(R.string.module_update),
+                                            text = stringResource(R.string.module_updated),
                                             style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
-                                                containerColor = MaterialTheme.colorScheme.onTertiary,
+                                                containerColor = MaterialTheme.colorScheme.tertiaryContainer,
                                                 contentColor = MaterialTheme.colorScheme.onTertiaryContainer
                                             )
                                         )
                                     }
-                                    if (!module.remove) {
-                                        if (module.update) {
-                                            LabelItem(
-                                                text = stringResource(R.string.module_updated),
-                                                style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
-                                                    containerColor = MaterialTheme.colorScheme.tertiaryContainer,
-                                                    contentColor = MaterialTheme.colorScheme.onTertiaryContainer
-                                                )
-                                            )
-                                        }
-                                    }
-                                    if (!module.remove) {
-                                        if (module.hasWebUi) {
-                                            LabelItem(
-                                                text = stringResource(R.string.webui),
-                                                style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
-                                                    containerColor = MaterialTheme.colorScheme.primaryContainer,
-                                                    contentColor = MaterialTheme.colorScheme.onPrimaryContainer
-                                                )
-                                            )
-                                        }
-                                        if (module.hasActionScript) {
-                                            LabelItem(
-                                                text = stringResource(R.string.action),
-                                                style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
-                                                    containerColor = MaterialTheme.colorScheme.secondaryContainer,
-                                                    contentColor = MaterialTheme.colorScheme.onSecondaryContainer
-                                                )
-                                            )
-                                        }
-                                    }
                                 }
-
-                                Spacer(modifier = Modifier.height(8.dp))
-
-                                Text(
-                                    text = module.name,
-                                    fontSize = MaterialTheme.typography.titleMedium.fontSize,
-                                    fontWeight = FontWeight.SemiBold,
-                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                    fontFamily = MaterialTheme.typography.titleMedium.fontFamily,
-                                    textDecoration = textDecoration,
-                                )
-
-                                Text(
-                                    text = "$moduleVersion: ${module.version}",
-                                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                    textDecoration = textDecoration
-                                )
-
-                                Text(
-                                    text = "$moduleAuthor: ${module.author}",
-                                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                    textDecoration = textDecoration
-                                )
-
-                                if (developerOptionsEnabled) {
-
-                                    Text(
-                                        text = "$moduleId: ${module.id}",
-                                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                        lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                        textDecoration = textDecoration
-                                    )
-
-                                    Text(
-                                        text = "$moduleVersionCode: ${module.versionCode}",
-                                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                        lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                        textDecoration = textDecoration
-                                    )
-
-                                    Text(
-                                        text = if (module.updateJson.isNotEmpty()) "$moduleUpdateJson: ${module.updateJson}" else "$moduleUpdateJson: $moduleUpdateJsonEmpty",
-                                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                                        lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                                        textDecoration = textDecoration
-                                    )
+                                if (module.enabled && !module.remove) {
+                                    if (module.hasWebUi) {
+                                        LabelItem(
+                                            text = stringResource(R.string.webui),
+                                            style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
+                                                containerColor = MaterialTheme.colorScheme.primaryContainer,
+                                                contentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                                            )
+                                        )
+                                    }
+                                    if (module.hasActionScript) {
+                                        LabelItem(
+                                            text = stringResource(R.string.action),
+                                            style = com.dergoogler.mmrl.ui.component.LabelItemDefaults.style.copy(
+                                                containerColor = MaterialTheme.colorScheme.secondaryContainer,
+                                                contentColor = MaterialTheme.colorScheme.onSecondaryContainer
+                                            )
+                                        )
+                                    }
                                 }
                             }
 
-                            Row(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.End,
-                            ) {
-                                var expanded by remember { mutableStateOf(false) }
-                                IconButton(onClick = { expanded = true }) {
-                                    Icon(
-                                        Icons.Filled.MoreVert,
-                                        contentDescription = "Module actions"
-                                    )
-                                }
-                                DropdownMenu(
-                                    expanded = expanded,
-                                    onDismissRequest = { expanded = false }
-                                ) {
-                                    if (updateUrl.isNotEmpty() && !module.remove) {
-                                        DropdownMenuItem(
-                                            text = { Text(stringResource(R.string.module_update)) },
-                                            onClick = {
-                                                expanded = false
-                                                onUpdate(module)
-                                            }
-                                        )
-                                        HorizontalDivider()
-                                    }
-                                    
-                                    if (!module.remove) {
-                                        if (module.hasWebUi) {
-                                            DropdownMenuItem(
-                                                text = { Text(stringResource(R.string.webui)) },
-                                                onClick = {
-                                                    expanded = false
-                                                    onClick(module)
-                                                }
-                                            )
-                                        }
-                                        if (module.hasActionScript) {
-                                            DropdownMenuItem(
-                                                text = { Text(stringResource(R.string.action)) },
-                                                onClick = {
-                                                    expanded = false
-                                                    navigator.navigate(ExecuteModuleActionScreenDestination(module.dirId))
-                                                    viewModel.markNeedRefresh()
-                                                }
-                                            )
-                                        }
+                            Spacer(modifier = Modifier.height(8.dp))
 
-                                        if (module.hasWebUi || module.hasActionScript ) {
-                                            HorizontalDivider()
-                                        }
-                                    }
+                            Text(
+                                text = module.name,
+                                fontSize = MaterialTheme.typography.titleMedium.fontSize,
+                                fontWeight = FontWeight.SemiBold,
+                                lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+                                fontFamily = MaterialTheme.typography.titleMedium.fontFamily,
+                                textDecoration = textDecoration,
+                            )
 
-                                    if (!module.remove) {
-                                        DropdownMenuItem(
-                                            text = {
-                                                Text(
-                                                    if (module.enabled) stringResource(R.string.disable)
-                                                    else stringResource(R.string.enable)
-                                                )
-                                            },
-                                            onClick = {
-                                                expanded = false
-                                                onCheckChanged(!module.enabled)
-                                            }
-                                        )
-                                    }
-                                    if (module.remove) {
-                                        DropdownMenuItem(
-                                            text = { Text(stringResource(R.string.restore)) },
-                                            onClick = {
-                                                expanded = false
-                                                onRestore(module)
-                                            }
-                                        )
-                                    } else {
-                                        DropdownMenuItem(
-                                            text = { Text(stringResource(R.string.uninstall)) },
-                                            onClick = {
-                                                expanded = false
-                                                onUninstall(module)
-                                            }
-                                        )
-                                    }
-                                }
+                            Text(
+                                text = "$moduleVersion: ${module.version}",
+                                fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                                lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+                                fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                                textDecoration = textDecoration
+                            )
+
+                            Text(
+                                text = "$moduleAuthor: ${module.author}",
+                                fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                                lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+                                fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                                textDecoration = textDecoration
+                            )
+
+                            if (developerOptionsEnabled) {
+
+                                Text(
+                                    text = "$moduleId: ${module.id}",
+                                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+                                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                                    textDecoration = textDecoration
+                                )
+
+                                Text(
+                                    text = "$moduleVersionCode: ${module.versionCode}",
+                                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+                                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                                    textDecoration = textDecoration
+                                )
+
+                                Text(
+                                    text = if (module.updateJson.isNotEmpty()) "$moduleUpdateJson: ${module.updateJson}" else "$moduleUpdateJson: $moduleUpdateJsonEmpty",
+                                    fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                                    lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+                                    fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                                    textDecoration = textDecoration
+                                )
                             }
                         }
 
-                        Spacer(modifier = Modifier.height(12.dp))
+                        Spacer(modifier = Modifier.weight(1f))
 
-                        Text(
-                            text = module.description,
-                            fontSize = MaterialTheme.typography.bodySmall.fontSize,
-                            fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
-                            lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
-                            fontWeight = MaterialTheme.typography.bodySmall.fontWeight,
-                            overflow = TextOverflow.Ellipsis,
-                            maxLines = 4,
-                            textDecoration = textDecoration
-                        )
+                        Row(
+                            modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.End,
+                        ) {
+                            Switch(
+                                enabled = !module.update,
+                                checked = module.enabled,
+                                onCheckedChange = onCheckChanged,
+                                interactionSource = if (!module.hasWebUi) interactionSource else null
+                            )
+                        }
+                    }
 
-                        Spacer(modifier = Modifier.height(6.dp))
+                    Spacer(modifier = Modifier.height(12.dp))
+
+                    Text(
+                        text = module.description,
+                        fontSize = MaterialTheme.typography.bodySmall.fontSize,
+                        fontFamily = MaterialTheme.typography.bodySmall.fontFamily,
+                        lineHeight = MaterialTheme.typography.bodySmall.lineHeight,
+                        fontWeight = MaterialTheme.typography.bodySmall.fontWeight,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 4,
+                        textDecoration = textDecoration
+                    )
+
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                    HorizontalDivider(thickness = Dp.Hairline)
+
+                    Spacer(modifier = Modifier.height(12.dp))
+
+                    Row(
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        if (module.hasActionScript) {
+                            FilledTonalButton(
+                                modifier = Modifier.defaultMinSize(52.dp, 32.dp),
+                                enabled = !module.remove && module.enabled,
+                                onClick = {
+                                    navigator.navigate(ExecuteModuleActionScreenDestination(module.dirId))
+                                    viewModel.markNeedRefresh()
+                                },
+                                contentPadding = ButtonDefaults.TextButtonContentPadding
+                            ) {
+                                Icon(
+                                    modifier = Modifier.size(20.dp),
+                                    imageVector = Icons.Outlined.PlayArrow,
+                                    contentDescription = null
+                                )
+                            }
+
+                            Spacer(modifier = Modifier.weight(0.1f, true))
+                        }
+
+                        if (module.hasWebUi) {
+                            FilledTonalButton(
+                                modifier = Modifier.defaultMinSize(52.dp, 32.dp),
+                                enabled = !module.remove && module.enabled,
+                                onClick = { onClick(module) },
+                                interactionSource = interactionSource,
+                                contentPadding = ButtonDefaults.TextButtonContentPadding
+                            ) {
+                                Icon(
+                                    modifier = Modifier.size(20.dp),
+                                    imageVector = Icons.AutoMirrored.Outlined.Wysiwyg,
+                                    contentDescription = null
+                                )
+                            }
+                        }
+
+                        Spacer(modifier = Modifier.weight(1f, true))
+
+                        if (updateUrl.isNotEmpty()) {
+                            Button(
+                                modifier = Modifier.defaultMinSize(52.dp, 32.dp),
+                                enabled = !module.remove,
+                                onClick = { onUpdate(module) },
+                                shape = ButtonDefaults.textShape,
+                                contentPadding = ButtonDefaults.TextButtonContentPadding
+                            ) {
+                                Icon(
+                                    modifier = Modifier.size(20.dp),
+                                    imageVector = Icons.Outlined.Download,
+                                    contentDescription = null
+                                )
+                            }
+
+                            Spacer(modifier = Modifier.weight(0.1f, true))
+                        }
+
+                        if (module.remove) {
+                            FilledTonalButton(
+                                modifier = Modifier.defaultMinSize(52.dp, 32.dp),
+                                onClick = { onRestore(module) },
+                                contentPadding = ButtonDefaults.TextButtonContentPadding
+                            ) {
+                                Icon(
+                                    modifier = Modifier.size(20.dp),
+                                    imageVector = Icons.Outlined.Restore,
+                                    contentDescription = null
+                                )
+                            }
+                        } else {
+                            FilledTonalButton(
+                                modifier = Modifier.defaultMinSize(52.dp, 32.dp),
+                                enabled = true,
+                                onClick = { onUninstall(module) },
+                                contentPadding = ButtonDefaults.TextButtonContentPadding
+                            ) {
+                                Icon(
+                                    modifier = Modifier.size(20.dp),
+                                    imageVector = Icons.Outlined.Delete,
+                                    contentDescription = null
+                                )
+                            }
+                        }
                     }
                 }
             }