diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 049f8d3..26eaf3e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -56,6 +56,7 @@ android {
     }
     buildFeatures {
         compose = true
+        viewBinding = true
     }
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a730ecb..68af5ff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,8 @@
     <uses-feature android:name="android.hardware.camera.any"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 
     <application
         android:name=".HandyCamApplication"
@@ -42,7 +44,7 @@
         <activity
             android:name=".CameraControlActivity"
             android:exported="false"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="fullSensor" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/handycam/CameraControlActivity.kt b/app/src/main/java/com/example/handycam/CameraControlActivity.kt
index 8889fc7..21eb24f 100644
--- a/app/src/main/java/com/example/handycam/CameraControlActivity.kt
+++ b/app/src/main/java/com/example/handycam/CameraControlActivity.kt
@@ -10,11 +10,14 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.MotionEvent
+import android.view.ScaleGestureDetector
 import android.view.Surface
 import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.Button
 import android.widget.ImageButton
+import android.widget.SeekBar
 import android.widget.Spinner
-import android.widget.ArrayAdapter
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -33,6 +36,14 @@ import java.util.concurrent.TimeUnit
 
 private const val TAG = "CameraControlActivity"
 
+// Camera2 AWB mode constants (mirrors CaptureRequest.CONTROL_AWB_MODE_*)
+private const val AWB_AUTO = 1
+private const val AWB_DAYLIGHT = 2
+private const val AWB_INCANDESCENT = 3
+private const val AWB_FLUORESCENT = 4
+private const val AWB_CLOUDY = 8
+private const val AWB_SHADE = 9
+
 class CameraControlActivity : AppCompatActivity() {
 
     private lateinit var previewView: PreviewView
@@ -40,6 +51,8 @@ class CameraControlActivity : AppCompatActivity() {
     private lateinit var cameraSpinner: Spinner
     private lateinit var exposureLabel: TextView
     private lateinit var focusRing: View
+    private lateinit var zoomSeekBar: SeekBar
+    private lateinit var zoomLabel: TextView
     private var cameraManager: android.hardware.camera2.CameraManager? = null
 
     private var cameraControl: androidx.camera.core.CameraControl? = null
@@ -48,11 +61,12 @@ class CameraControlActivity : AppCompatActivity() {
     private var adjustingExposure = false
     private var exposureStartY = 0f
     private var lastExposureIndex = 0
-    
-    private var cameraReadyReceiver: BroadcastReceiver? = null
-    private var useCameraX = false // Track which camera system is being used
+    private var currentLinearZoom = 0f
 
+    private var cameraReadyReceiver: BroadcastReceiver? = null
+    private var useCameraX = false
     private lateinit var settingsManager: SettingsManager
+    private lateinit var scaleGestureDetector: ScaleGestureDetector
 
     private val cameraPermissionLauncher = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
@@ -69,29 +83,11 @@ class CameraControlActivity : AppCompatActivity() {
 
         settingsManager = SettingsManager.getInstance(this)
 
-        // Setup observers for settings manager
         settingsManager.isStreaming.observe(this) { streaming ->
-            if (!streaming) {
-                finish()
-            }
+            if (!streaming) finish()
         }
-
-        settingsManager.torchEnabled.observe(this) { torchEnabled ->
-            // Handle torch changes
-        }
-
-        settingsManager.autoFocus.observe(this) { autoFocus ->
-            // Handle auto focus changes
-        }
-
         settingsManager.exposure.observe(this) { exposure ->
-            runOnUiThread {
-                exposureLabel.text = "Exposure: $exposure"
-            }
-        }
-
-        settingsManager.camera.observe(this) { camera ->
-            // Handle camera switching
+            exposureLabel.text = "EV: $exposure"
         }
 
         previewView = findViewById(R.id.previewView)
@@ -99,150 +95,160 @@ class CameraControlActivity : AppCompatActivity() {
         cameraSpinner = findViewById(R.id.cameraSpinner)
         exposureLabel = findViewById(R.id.exposureLabel)
         focusRing = findViewById(R.id.focusRing)
+        zoomSeekBar = findViewById(R.id.zoomSeekBar)
+        zoomLabel = findViewById(R.id.zoomLabel)
 
         try {
-            cameraManager = getSystemService(android.content.Context.CAMERA_SERVICE) as android.hardware.camera2.CameraManager
+            cameraManager = getSystemService(Context.CAMERA_SERVICE) as android.hardware.camera2.CameraManager
         } catch (_: Exception) {}
-        
-        // Check if streaming service is running to determine camera mode
+
         val prefs = getSharedPreferences("handy_prefs", Context.MODE_PRIVATE)
         val isStreaming = prefs.getBoolean("isStreaming", false)
-        useCameraX = prefs.getBoolean("useAvc", false).not() // CameraX for MJPEG, Camera2 for AVC
-        
+        useCameraX = !prefs.getBoolean("useAvc", false)
+
         if (!isStreaming) {
             Toast.makeText(this, "Please start streaming first", Toast.LENGTH_LONG).show()
             finish()
             return
         }
 
+        setupFlashButton()
+        setupCameraSpinner()
+        setupZoomControls()
+        setupTouchGestures()
+
+        cameraReadyReceiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                runOnUiThread { updateCameraControls() }
+            }
+        }
+        registerReceiver(cameraReadyReceiver, IntentFilter("com.example.handycam.CAMERA_READY"), Context.RECEIVER_NOT_EXPORTED)
+
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+            cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+        } else setupPreview()
+    }
+
+    private fun setupFlashButton() {
         flashBtn.setOnClickListener {
             val ctrl = SharedSurfaceProvider.cameraControl
             val mgr = cameraManager
-            if (ctrl == null) {
-                // Try to toggle via CameraManager as a fallback
-                val prefs = getSharedPreferences("handy_prefs", Context.MODE_PRIVATE)
-                val prefCam = prefs.getString("camera", null)
-                val camIdFallback = try {
-                    if (prefCam != null && mgr?.cameraIdList?.contains(prefCam) == true) prefCam else mgr?.cameraIdList?.getOrNull(cameraSpinner.selectedItemPosition)
-                } catch (_: Exception) { null }
-                if (camIdFallback != null) {
-                    lifecycleScope.launch(Dispatchers.Main) {
-                        try {
-                            val info = SharedSurfaceProvider.cameraInfo
-                            val currentTorch = info?.torchState?.value
-                            val enable = currentTorch != androidx.camera.core.TorchState.ON
-                            try {
-                                mgr?.setTorchMode(camIdFallback, enable)
-                            } catch (e: Exception) {
-                                Log.w(TAG, "CameraManager.setTorchMode failed", e)
-                                Toast.makeText(this@CameraControlActivity, "Torch toggle failed", Toast.LENGTH_SHORT).show()
-                            }
-                        } catch (e: Exception) {
-                            Log.w(TAG, "Torch toggle fallback failed", e)
-                            Toast.makeText(this@CameraControlActivity, "Torch toggle failed", Toast.LENGTH_SHORT).show()
-                        }
-                    }
-                } else {
-                    Toast.makeText(this, "Camera not ready", Toast.LENGTH_SHORT).show()
-                }
-            } else {
-                // toggle torch via CameraX control, with CameraManager fallback
-                lifecycleScope.launch(Dispatchers.Main) {
-                    try {
-                        val info = SharedSurfaceProvider.cameraInfo ?: return@launch
-                        val torchState = info.torchState.value
-                        val enable = torchState != androidx.camera.core.TorchState.ON
-                        try {
-                            ctrl.enableTorch(enable)
-                        } catch (e: Exception) {
-                            // Some implementations return a ListenableFuture; attempt to call anyway
-                            try {
-                                val f = ctrl.javaClass.getMethod("enableTorch", Boolean::class.javaPrimitiveType).invoke(ctrl, enable)
-                            } catch (_: Exception) {}
-                        }
-
-                        // Also attempt CameraManager fallback to ensure hardware torch toggles on some devices
-                        try {
-                            val prefs = getSharedPreferences("handy_prefs", Context.MODE_PRIVATE)
-                            val prefCam = prefs.getString("camera", null)
-                            val camIdFallback = try { if (prefCam != null && mgr?.cameraIdList?.contains(prefCam) == true) prefCam else mgr?.cameraIdList?.getOrNull(cameraSpinner.selectedItemPosition) } catch (_: Exception) { null }
-                            if (camIdFallback != null) {
-                                try { mgr?.setTorchMode(camIdFallback, enable) } catch (_: Exception) {}
-                            }
-                        } catch (_: Exception) {}
-                    } catch (e: Exception) {
-                        Log.w(TAG, "Torch toggle failed", e)
-                        Toast.makeText(this@CameraControlActivity, "Torch toggle failed", Toast.LENGTH_SHORT).show()
+            lifecycleScope.launch(Dispatchers.Main) {
+                try {
+                    val info = SharedSurfaceProvider.cameraInfo
+                    val enable = info?.torchState?.value != androidx.camera.core.TorchState.ON
+                    if (ctrl != null) {
+                        ctrl.enableTorch(enable)
+                    } else {
+                        val prefs = getSharedPreferences("handy_prefs", Context.MODE_PRIVATE)
+                        val prefCam = prefs.getString("camera", null)
+                        val camId = try {
+                            if (prefCam != null && mgr?.cameraIdList?.contains(prefCam) == true) prefCam
+                            else mgr?.cameraIdList?.getOrNull(cameraSpinner.selectedItemPosition)
+                        } catch (_: Exception) { null }
+                        if (camId != null) mgr?.setTorchMode(camId, enable)
                     }
+                    settingsManager.setTorchEnabled(enable)
+                    updateFlashButton(enable)
+                } catch (e: Exception) {
+                    Log.w(TAG, "Torch toggle failed", e)
+                    Toast.makeText(this@CameraControlActivity, "Torch toggle failed", Toast.LENGTH_SHORT).show()
                 }
             }
         }
+    }
 
-        // populate camera list into spinner
+    private fun setupCameraSpinner() {
         try {
-            val mgr = cameraManager
-            if (mgr != null) {
-                val ids = mgr.cameraIdList.toList()
-                val labels = mutableListOf<String>()
-                for (id in ids) {
-                    try {
-                        val chars = mgr.getCameraCharacteristics(id)
-                        val facing = when (chars.get(android.hardware.camera2.CameraCharacteristics.LENS_FACING)) {
-                            android.hardware.camera2.CameraCharacteristics.LENS_FACING_FRONT -> "front"
-                            android.hardware.camera2.CameraCharacteristics.LENS_FACING_BACK -> "back"
-                            else -> "unknown"
-                        }
-                        labels.add("$id ($facing)")
-                    } catch (_: Exception) {
-                        labels.add(id)
+            val mgr = cameraManager ?: return
+            val ids = mgr.cameraIdList.toList()
+            val labels = ids.map { id ->
+                try {
+                    val chars = mgr.getCameraCharacteristics(id)
+                    val facing = when (chars.get(android.hardware.camera2.CameraCharacteristics.LENS_FACING)) {
+                        android.hardware.camera2.CameraCharacteristics.LENS_FACING_FRONT -> "front"
+                        android.hardware.camera2.CameraCharacteristics.LENS_FACING_BACK -> "back"
+                        else -> "unknown"
                     }
-                }
-                val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, labels).also { it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) }
-                cameraSpinner.adapter = adapter
-                cameraSpinner.setSelection(0)
-                cameraSpinner.setOnItemSelectedListener(object : android.widget.AdapterView.OnItemSelectedListener {
-                    override fun onItemSelected(parent: android.widget.AdapterView<*>, view: View?, position: Int, id: Long) {
-                        val camId = try { mgr.cameraIdList[position] } catch (_: Exception) { null }
-                        if (camId != null) {
-                            // Tell the service to switch camera
-                            val intent = Intent(this@CameraControlActivity, StreamService::class.java).apply {
-                                action = "com.example.handycam.ACTION_SET_CAMERA"
-                                putExtra("camera", camId)
-                            }
-                            startService(intent)
-                        }
-                    }
-                    override fun onNothingSelected(parent: android.widget.AdapterView<*>) {}
-                })
+                    "$id ($facing)"
+                } catch (_: Exception) { id }
+            }
+            val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, labels).also {
+                it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
             }
+            cameraSpinner.adapter = adapter
+            cameraSpinner.setOnItemSelectedListener(object : android.widget.AdapterView.OnItemSelectedListener {
+                override fun onItemSelected(parent: android.widget.AdapterView<*>, view: View?, position: Int, id: Long) {
+                    val camId = try { mgr.cameraIdList[position] } catch (_: Exception) { null } ?: return
+                    startService(Intent(this@CameraControlActivity, StreamService::class.java).apply {
+                        action = "com.example.handycam.ACTION_SET_CAMERA"
+                        putExtra("camera", camId)
+                    })
+                }
+                override fun onNothingSelected(parent: android.widget.AdapterView<*>) {}
+            })
         } catch (_: Exception) {}
+    }
+
+    private fun setupZoomControls() {
+        zoomSeekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) applyZoom(progress / 100f)
+            }
+            override fun onStartTrackingTouch(seekBar: SeekBar) {}
+            override fun onStopTrackingTouch(seekBar: SeekBar) {}
+        })
+
+        scaleGestureDetector = ScaleGestureDetector(this, object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
+            override fun onScale(detector: ScaleGestureDetector): Boolean {
+                val info = SharedSurfaceProvider.cameraInfo
+                val maxZoom = info?.zoomState?.value?.maxZoomRatio ?: 8f
+                val minZoom = info?.zoomState?.value?.minZoomRatio ?: 1f
+                val currentZoom = minZoom + (maxZoom - minZoom) * currentLinearZoom
+                val newZoom = (currentZoom * detector.scaleFactor).coerceIn(minZoom, maxZoom)
+                val linear = ((newZoom - minZoom) / (maxZoom - minZoom)).coerceIn(0f, 1f)
+                applyZoom(linear)
+                return true
+            }
+        })
+    }
 
-        // gestures: tap to focus, long-press then slide vertically to change exposure
+    private fun applyZoom(linearZoom: Float) {
+        currentLinearZoom = linearZoom
+        settingsManager.setZoom(linearZoom)
+        val info = SharedSurfaceProvider.cameraInfo
+        val zoomRatio = info?.zoomState?.value?.let { state ->
+            state.minZoomRatio + (state.maxZoomRatio - state.minZoomRatio) * linearZoom
+        } ?: (1f + 7f * linearZoom)
+        zoomLabel.text = String.format("%.1fx", zoomRatio)
+    }
+
+
+    private fun setupTouchGestures() {
         val gd = object : android.view.GestureDetector.SimpleOnGestureListener() {
-            override fun onSingleTapUp(e: android.view.MotionEvent): Boolean {
+            override fun onSingleTapUp(e: MotionEvent): Boolean {
                 performTapToFocus(e.x, e.y)
                 return true
             }
-
-            override fun onLongPress(e: android.view.MotionEvent) {
+            override fun onLongPress(e: MotionEvent) {
                 adjustingExposure = true
                 exposureStartY = e.y
-                // snapshot current exposure index
                 lastExposureIndex = SharedSurfaceProvider.cameraInfo?.exposureState?.exposureCompensationIndex ?: 0
                 exposureLabel.visibility = View.VISIBLE
             }
         }
-
         val gestureDetector = android.view.GestureDetector(this, gd)
 
         previewView.setOnTouchListener { _, motion ->
-            gestureDetector.onTouchEvent(motion)
+            scaleGestureDetector.onTouchEvent(motion)
+            if (!scaleGestureDetector.isInProgress) {
+                gestureDetector.onTouchEvent(motion)
+            }
             when (motion.actionMasked) {
                 MotionEvent.ACTION_MOVE -> {
-                    if (adjustingExposure) {
+                    if (adjustingExposure && !scaleGestureDetector.isInProgress) {
                         val dy = exposureStartY - motion.y
                         val height = previewView.height.coerceAtLeast(1)
-                        // map dy to exposure range
                         val range = SharedSurfaceProvider.cameraInfo?.exposureState?.exposureCompensationRange
                         if (range != null) {
                             val span = range.upper - range.lower
@@ -252,6 +258,7 @@ class CameraControlActivity : AppCompatActivity() {
                                 try {
                                     SharedSurfaceProvider.cameraControl?.setExposureCompensationIndex(target)
                                     exposureLabel.text = "EV: $target"
+                                    settingsManager.setExposure(target)
                                 } catch (e: Exception) {
                                     Log.w(TAG, "Failed setting exposure index", e)
                                 }
@@ -268,63 +275,41 @@ class CameraControlActivity : AppCompatActivity() {
             }
             true
         }
-        
-        // Register receiver to know when camera is ready
-        cameraReadyReceiver = object : BroadcastReceiver() {
-            override fun onReceive(context: Context?, intent: Intent?) {
-                Log.i(TAG, "Camera ready signal received")
-                runOnUiThread {
-                    updateCameraControls()
-                }
-            }
-        }
-        registerReceiver(cameraReadyReceiver, IntentFilter("com.example.handycam.CAMERA_READY"), Context.RECEIVER_NOT_EXPORTED)
-
-        // permission check
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
-            cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
-        } else setupPreview()
     }
 
     private fun setupPreview() {
-        // For both modes, provide surface provider to the service
-        // The service will handle Camera2 or CameraX appropriately
         SharedSurfaceProvider.previewSurfaceProvider = previewView.surfaceProvider
-        
-        // Notify service to reconfigure with preview
-        val intent = Intent(this, StreamService::class.java).apply {
+        startService(Intent(this, StreamService::class.java).apply {
             action = "com.example.handycam.ACTION_SET_PREVIEW_SURFACE"
             putExtra("surfaceToken", if (useCameraX) "camerax_preview" else "camera2_preview")
-        }
-        startService(intent)
-        
-        Log.i(TAG, "Setup preview surface provider for ${if (useCameraX) "CameraX" else "Camera2"} mode")
-        
-        // Update controls with current camera state
+        })
         updateCameraControls()
     }
-    
+
     private fun updateCameraControls() {
-        // Update UI with current camera state from shared provider
         SharedSurfaceProvider.cameraInfo?.let { info ->
-            val torchState = info.torchState.value
-            try {
-                // set lightning bolt and tint it to indicate state
-                flashBtn.setImageResource(R.drawable.ic_flash)
-                val color = if (torchState == androidx.camera.core.TorchState.ON) android.graphics.Color.YELLOW else android.graphics.Color.WHITE
-                flashBtn.imageTintList = android.content.res.ColorStateList.valueOf(color)
-            } catch (_: Exception) {}
+            val torchOn = info.torchState.value == androidx.camera.core.TorchState.ON
+            updateFlashButton(torchOn)
             val ev = info.exposureState.exposureCompensationIndex
             exposureLabel.text = "EV: $ev"
+            info.zoomState.value?.let { zoomState ->
+                val linear = ((zoomState.zoomRatio - zoomState.minZoomRatio) /
+                        (zoomState.maxZoomRatio - zoomState.minZoomRatio)).coerceIn(0f, 1f)
+                currentLinearZoom = linear
+                zoomSeekBar.progress = (linear * 100).toInt()
+                zoomLabel.text = String.format("%.1fx", zoomState.zoomRatio)
+            }
         } ?: run {
-            // If CameraInfo not available yet, try to infer flash availability from CameraManager
             try {
                 val prefs = getSharedPreferences("handy_prefs", Context.MODE_PRIVATE)
                 val prefCam = prefs.getString("camera", null)
                 val mgr = cameraManager
-                val camIdFallback = try { if (prefCam != null && mgr?.cameraIdList?.contains(prefCam) == true) prefCam else mgr?.cameraIdList?.getOrNull(cameraSpinner.selectedItemPosition) } catch (_: Exception) { null }
-                if (camIdFallback != null) {
-                    val chars = mgr?.getCameraCharacteristics(camIdFallback)
+                val camId = try {
+                    if (prefCam != null && mgr?.cameraIdList?.contains(prefCam) == true) prefCam
+                    else mgr?.cameraIdList?.getOrNull(cameraSpinner.selectedItemPosition)
+                } catch (_: Exception) { null }
+                if (camId != null) {
+                    val chars = mgr?.getCameraCharacteristics(camId)
                     val hasFlash = chars?.get(android.hardware.camera2.CameraCharacteristics.FLASH_INFO_AVAILABLE) == true
                     flashBtn.setImageResource(R.drawable.ic_flash)
                     flashBtn.imageTintList = android.content.res.ColorStateList.valueOf(android.graphics.Color.WHITE)
@@ -334,6 +319,14 @@ class CameraControlActivity : AppCompatActivity() {
         }
     }
 
+    private fun updateFlashButton(enabled: Boolean) {
+        try {
+            flashBtn.setImageResource(R.drawable.ic_flash)
+            val color = if (enabled) android.graphics.Color.YELLOW else android.graphics.Color.WHITE
+            flashBtn.imageTintList = android.content.res.ColorStateList.valueOf(color)
+        } catch (_: Exception) {}
+    }
+
     private fun performTapToFocus(x: Float, y: Float) {
         try {
             val factory: MeteringPointFactory = previewView.meteringPointFactory
@@ -342,33 +335,20 @@ class CameraControlActivity : AppCompatActivity() {
                 .setAutoCancelDuration(3_000, TimeUnit.MILLISECONDS)
                 .build()
             SharedSurfaceProvider.cameraControl?.startFocusAndMetering(action)
-            // show focus ring at touch point
-            try {
-                val ring = focusRing
-                val halfW = ring.width / 2f
-                val halfH = ring.height / 2f
-                // position: previewView's coordinate space -> parent FrameLayout
-                val location = IntArray(2)
-                previewView.getLocationOnScreen(location)
-                val pvX = location[0]
-                val pvY = location[1]
-                // get parent location
-                val parentLoc = IntArray(2)
-                (ring.parent as View).getLocationOnScreen(parentLoc)
-                val relX = x + pvX - parentLoc[0]
-                val relY = y + pvY - parentLoc[1]
-                ring.translationX = relX - halfW
-                ring.translationY = relY - halfH
-                ring.scaleX = 0.6f
-                ring.scaleY = 0.6f
-                ring.alpha = 1f
-                ring.visibility = View.VISIBLE
-                ring.animate().scaleX(1f).scaleY(1f).alpha(0f).setDuration(650).withEndAction {
-                    ring.visibility = View.GONE
-                }.start()
-            } catch (e: Exception) {
-                Log.w(TAG, "Failed to show focus ring", e)
-            }
+            val ring = focusRing
+            val halfW = ring.width / 2f
+            val halfH = ring.height / 2f
+            val location = IntArray(2)
+            previewView.getLocationOnScreen(location)
+            val parentLoc = IntArray(2)
+            (ring.parent as View).getLocationOnScreen(parentLoc)
+            ring.translationX = x + location[0] - parentLoc[0] - halfW
+            ring.translationY = y + location[1] - parentLoc[1] - halfH
+            ring.scaleX = 0.6f; ring.scaleY = 0.6f; ring.alpha = 1f
+            ring.visibility = View.VISIBLE
+            ring.animate().scaleX(1f).scaleY(1f).alpha(0f).setDuration(650).withEndAction {
+                ring.visibility = View.GONE
+            }.start()
         } catch (e: Exception) {
             Log.w(TAG, "Tap-to-focus failed", e)
         }
@@ -376,23 +356,14 @@ class CameraControlActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        
-        // Clean up preview surface
-        if (useCameraX) {
-            SharedSurfaceProvider.previewSurfaceProvider = null
-        } else {
-            SharedSurfaceProvider.previewSurface = null
-        }
-        
-        // Notify service to remove preview
+        if (useCameraX) SharedSurfaceProvider.previewSurfaceProvider = null
+        else SharedSurfaceProvider.previewSurface = null
         try {
-            val intent = Intent(this, StreamService::class.java).apply {
+            startService(Intent(this, StreamService::class.java).apply {
                 action = "com.example.handycam.ACTION_SET_PREVIEW_SURFACE"
                 putExtra("surfaceToken", null as String?)
-            }
-            startService(intent)
+            })
         } catch (_: Exception) {}
-        
         try { cameraReadyReceiver?.let { unregisterReceiver(it) } } catch (_: Exception) {}
     }
 }
diff --git a/app/src/main/java/com/example/handycam/MainActivity.kt b/app/src/main/java/com/example/handycam/MainActivity.kt
index d1be805..fc93b50 100644
--- a/app/src/main/java/com/example/handycam/MainActivity.kt
+++ b/app/src/main/java/com/example/handycam/MainActivity.kt
@@ -1,28 +1,26 @@
 package com.example.handycam
 
 import android.Manifest
+import android.content.BroadcastReceiver
 import android.os.Build
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CameraManager
 import android.os.Bundle
-import android.widget.Button
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.Switch
-import android.widget.TextView
+import android.widget.ArrayAdapter
 import androidx.appcompat.app.AppCompatActivity
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import android.content.Context
-import android.view.View
-import android.util.Size
+import com.google.android.material.tabs.TabLayout
 import java.net.Inet4Address
 import java.net.NetworkInterface
-import androidx.camera.core.CameraControl
+import java.util.Locale
+import com.example.handycam.databinding.ActivityMainBinding
 
 private const val DEFAULT_PORT = 4747
+private const val PREFS_NAME = "handy_prefs"
 
 class MainActivity : AppCompatActivity() {
 
@@ -45,23 +43,23 @@ class MainActivity : AppCompatActivity() {
     }
 
     private var isStreaming = false
-    private var streamStateReceiver: android.content.BroadcastReceiver? = null
-    private var httpsServerStateReceiver: android.content.BroadcastReceiver? = null
-    private val PREFS = "handy_prefs"
-    private var pendingStartBundle: android.os.Bundle? = null
+    private var streamStateReceiver: BroadcastReceiver? = null
+    private var httpsServerStateReceiver: BroadcastReceiver? = null
+    private var pendingStartBundle: Bundle? = null
     private var isHttpsServerRunning = false
     private var pagerAdapter: SettingsPagerAdapter? = null
     private lateinit var settingsManager: SettingsManager
+    private lateinit var binding: ActivityMainBinding
+    private val cameraList = mutableListOf<Pair<String, String>>()
 
     private fun tryStartPendingIfPermsGranted() {
         val b = pendingStartBundle ?: return
-        // check permissions
         val camGranted = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
         val fgPerm = "android.permission.FOREGROUND_SERVICE_CAMERA"
         val fgGranted = if (Build.VERSION.SDK_INT >= 34) {
             ContextCompat.checkSelfPermission(this, fgPerm) == PackageManager.PERMISSION_GRANTED
         } else true
-        val notifGranted = if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+        val notifGranted = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
         } else true
 
@@ -74,437 +72,299 @@ class MainActivity : AppCompatActivity() {
             val jpeg = b.getInt("jpegQuality", 85)
             val fps = b.getInt("fps", 50)
             val useAvc = b.getBoolean("useAvc", false)
-            try {
-                startStreaming(host, port, width, height, camera, jpeg, fps, useAvc)
-                isStreaming = true
-                pendingStartBundle = null
-                try {
-                    val btn = findViewById<Button>(R.id.startButton)
-                    runOnUiThread { btn.text = "Stop Server" }
-                } catch (_: Exception) {}
-            } catch (_: Exception) {}
+            startStreaming(host, port, width, height, camera, jpeg, fps, useAvc)
+            isStreaming = true
+            pendingStartBundle = null
+            runOnUiThread { binding.startButton.text = getString(R.string.stop_server) }
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
-        settingsManager = SettingsManager.getInstance(this)
-
-        setContentView(R.layout.activity_main)
-
-        // Setup observers for settings manager
-        settingsManager.isStreaming.observe(this) { streaming ->
-            runOnUiThread {
-                try {
-                    val btn = findViewById<Button>(R.id.startButton)
-                    btn.text = if (streaming) "Stop Server" else "Start Server"
-                    isStreaming = streaming
-                } catch (_: Exception) {}
-            }
-        }
+        setSupportActionBar(binding.toolbar)
 
-        settingsManager.camera.observe(this) { camera ->
-            runOnUiThread {
-                try {
-                    val cameraEdit = findViewById<EditText>(R.id.cameraEdit)
-                    cameraEdit.setText(camera)
-                } catch (_: Exception) {}
-            }
-        }
-
-        settingsManager.port.observe(this) { port ->
-            runOnUiThread {
-                try {
-                    val portEdit = findViewById<EditText>(R.id.portEdit)
-                    if (portEdit.text.toString().toIntOrNull() != port) {
-                        portEdit.setText(port.toString())
-                    }
-                } catch (_: Exception) {}
-            }
-        }
-
-        settingsManager.width.observe(this) { width ->
-            runOnUiThread {
-                try {
-                    val widthEdit = findViewById<EditText>(R.id.widthEdit)
-                    if (widthEdit.text.toString().toIntOrNull() != width) {
-                        widthEdit.setText(width.toString())
-                    }
-                } catch (_: Exception) {}
-            }
-        }
+        settingsManager = SettingsManager.getInstance(this)
 
-        settingsManager.height.observe(this) { height ->
-            runOnUiThread {
-                try {
-                    val heightEdit = findViewById<EditText>(R.id.heightEdit)
-                    if (heightEdit.text.toString().toIntOrNull() != height) {
-                        heightEdit.setText(height.toString())
-                    }
-                } catch (_: Exception) {}
-            }
-        }
+        setupObservers()
 
-        settingsManager.fps.observe(this) { fps ->
-            runOnUiThread {
-                try {
-                    val fpsSpinner = findViewById<android.widget.Spinner>(R.id.fpsSpinner)
-                    val fpsChoices = listOf("15", "24", "30", "50", "60")
-                    val index = fpsChoices.indexOf(fps.toString())
-                    if (index >= 0 && fpsSpinner.selectedItemPosition != index) {
-                        fpsSpinner.setSelection(index)
-                    }
-                } catch (_: Exception) {}
-            }
-        }
-        settingsManager.httpsRunning.observe(this) { httpsRunning ->
-            runOnUiThread {
-                try {
-                    val httpsServerButton = findViewById<Button>(R.id.httpsServerButton)
-                    val httpsServerStatus = findViewById<TextView>(R.id.httpsServerStatus)
-                    httpsServerButton.text = if (httpsRunning) "Stop HTTPS Server" else "Start HTTPS Server"
-                    httpsServerStatus.text = if (httpsRunning) {
-                        val prefs = getSharedPreferences(PREFS, Context.MODE_PRIVATE)
-                        val port = prefs.getInt("httpsServerPort", 8443)
-                        "Server running on port $port\nAccess at: https://"+settingsManager.host.value+":"+settingsManager.port.value
-                    } else {
-                        "Server stopped"
-                    }
-                } catch (_: Exception) {}
-            }
-        }
-
-        val hostEdit = findViewById<EditText>(R.id.hostEdit)
-        val portEdit = findViewById<EditText>(R.id.portEdit)
-        val widthEdit = findViewById<EditText>(R.id.widthEdit)
-        val heightEdit = findViewById<EditText>(R.id.heightEdit)
-        val cameraEdit = findViewById<EditText>(R.id.cameraEdit)
-        val cameraListLayout = findViewById<LinearLayout>(R.id.cameraListLayout)
-        val settingsPager = findViewById<androidx.viewpager2.widget.ViewPager2>(R.id.settingsPager)
-        val settingsTabs = findViewById<com.google.android.material.tabs.TabLayout>(R.id.settingsTabLayout)
-        val fpsSpinner = findViewById<android.widget.Spinner>(R.id.fpsSpinner)
-        val startButton = findViewById<Button>(R.id.startButton)
-        val previewButton = findViewById<Button>(R.id.previewButton)
-        val httpsPortEdit = findViewById<EditText>(R.id.httpsPortEdit)
-        val httpsServerButton = findViewById<Button>(R.id.httpsServerButton)
-        val httpsServerStatus = findViewById<TextView>(R.id.httpsServerStatus)
-
-        // load saved settings
-        val prefs = getSharedPreferences(PREFS, Context.MODE_PRIVATE)
-        // Auto-fill host: prefer saved non-empty host, otherwise detect local IPv4
+        val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
         val savedHost = prefs.getString("host", null)
         val autoHost = if (!savedHost.isNullOrBlank() && savedHost != "0.0.0.0") savedHost else (getLocalIpAddress() ?: "0.0.0.0")
-        hostEdit.setText(autoHost)
-        portEdit.setText(prefs.getInt("port", DEFAULT_PORT).toString())
-        widthEdit.setText(prefs.getInt("width", 1080).toString())
-        heightEdit.setText(prefs.getInt("height", 1920).toString())
-        // defer camera display until we've populated the camera list; remember saved value
+        binding.hostEdit.setText(autoHost)
+        binding.portEdit.setText(prefs.getInt("port", DEFAULT_PORT).toString())
+        binding.widthEdit.setText(prefs.getInt("width", 1080).toString())
+        binding.heightEdit.setText(prefs.getInt("height", 1920).toString())
         val savedCamera = prefs.getString("camera", "back")
-        // populate FPS spinner with common choices
+
         val fpsChoices = listOf("15", "24", "30", "50", "60")
-        val fpsAdapter = android.widget.ArrayAdapter(this, android.R.layout.simple_spinner_item, fpsChoices).also {
+        val fpsAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, fpsChoices).also {
             it.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         }
-        fpsSpinner.adapter = fpsAdapter
+        binding.fpsSpinner.adapter = fpsAdapter
         val savedFps = prefs.getInt("fps", 60).toString()
-        fpsSpinner.setSelection(fpsChoices.indexOf(savedFps).coerceAtLeast(0))
+        binding.fpsSpinner.setSelection(fpsChoices.indexOf(savedFps).coerceAtLeast(0))
 
-        // Request camera permission early
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
-            != PackageManager.PERMISSION_GRANTED) {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
             cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
         }
 
-        // populate camera list (buttons show id, facing and focal length when available)
-        try {
-            val cm = getSystemService(Context.CAMERA_SERVICE) as CameraManager
-            // also add logical named picks for convenience
-            val backBtn = Button(this).apply {
-                text = "back"
-                setOnClickListener {
-                    if (isStreaming) {
-                        val intent = Intent(this@MainActivity, StreamService::class.java).apply {
-                            action = "com.example.handycam.ACTION_SET_CAMERA"
-                            putExtra("camera", "back")
-                        }
-                        startService(intent)
-                    } else {
-                        cameraEdit.tag = null
-                        cameraEdit.setText("back")
-                        try { prefs.edit().putString("camera", "back").apply() } catch (_: Exception) {}
-                    }
-                }
-            }
-            val frontBtn = Button(this).apply {
-                text = "front"
-                setOnClickListener {
-                    if (isStreaming) {
-                        val intent = Intent(this@MainActivity, StreamService::class.java).apply {
-                            action = "com.example.handycam.ACTION_SET_CAMERA"
-                            putExtra("camera", "front")
-                        }
-                        startService(intent)
-                    } else {
-                        cameraEdit.tag = null
-                        cameraEdit.setText("front")
-                        try { prefs.edit().putString("camera", "front").apply() } catch (_: Exception) {}
-                    }
-                }
-            }
-            cameraListLayout.addView(backBtn)
-            cameraListLayout.addView(frontBtn)
-            cm.cameraIdList.forEach { id ->
-                try {
-                    val chars = cm.getCameraCharacteristics(id)
-                    val facing = when (chars.get(CameraCharacteristics.LENS_FACING)) {
-                        CameraCharacteristics.LENS_FACING_FRONT -> "front"
-                        CameraCharacteristics.LENS_FACING_BACK -> "back"
-                        else -> "unknown"
-                    }
-                    // try to get a representative focal length to distinguish wide/normal
-                    val focalArr = chars.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS)
-                            val focalDesc = if (focalArr != null && focalArr.isNotEmpty()) {
-                                val f = focalArr[0]
-                                String.format("f=%.1fmm", f)
-                            } else ""
-
-                            val label = if (focalDesc.isNotEmpty()) "$id ($facing, $focalDesc)" else "$id ($facing)"
-                            val btn = Button(this).apply {
-                                text = label
-                                setOnClickListener {
-                                    if (isStreaming) {
-                                        val intent = Intent(this@MainActivity, StreamService::class.java).apply {
-                                            action = "com.example.handycam.ACTION_SET_CAMERA"
-                                            putExtra("camera", id)
-                                        }
-                                        startService(intent)
-                                    } else {
-                                        // display human label but keep the real id in tag
-                                        cameraEdit.tag = id
-                                        cameraEdit.setText(label)
-                                        try { prefs.edit().putString("camera", id).apply() } catch (_: Exception) {}
-                                    }
-                                }
-                            }
-                    cameraListLayout.addView(btn)
-                } catch (_: Exception) {}
-            }
-                    // after populating list, restore saved camera selection (id or logical)
-                    try {
-                        if (!savedCamera.isNullOrEmpty()) {
-                            if (savedCamera == "back" || savedCamera == "front") {
-                                cameraEdit.tag = null
-                                cameraEdit.setText(savedCamera)
-                            } else {
-                                // if saved value matches a physical id, find its button label
-                                if (cm.cameraIdList.contains(savedCamera)) {
-                                    val chars2 = cm.getCameraCharacteristics(savedCamera)
-                                    val facing2 = when (chars2.get(CameraCharacteristics.LENS_FACING)) {
-                                        CameraCharacteristics.LENS_FACING_FRONT -> "front"
-                                        CameraCharacteristics.LENS_FACING_BACK -> "back"
-                                        else -> "unknown"
-                                    }
-                                    val focalArr2 = chars2.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS)
-                                    val focalDesc2 = if (focalArr2 != null && focalArr2.isNotEmpty()) String.format("f=%.1fmm", focalArr2[0]) else ""
-                                    val lbl = if (focalDesc2.isNotEmpty()) "$savedCamera ($facing2, $focalDesc2)" else "$savedCamera ($facing2)"
-                                    cameraEdit.tag = savedCamera
-                                    cameraEdit.setText(lbl)
-                                } else {
-                                    cameraEdit.tag = null
-                                    cameraEdit.setText(savedCamera)
-                                }
-                            }
-                        }
-                    } catch (_: Exception) {}
-        } catch (_: Exception) {}
+        populateCameraList(savedCamera)
 
-        // setup tabs + pager
         pagerAdapter = SettingsPagerAdapter(this)
-        settingsPager.adapter = pagerAdapter
-        com.google.android.material.tabs.TabLayoutMediator(settingsTabs, settingsPager) { tab, position ->
+        binding.settingsPager.adapter = pagerAdapter
+        com.google.android.material.tabs.TabLayoutMediator(binding.settingsTabLayout, binding.settingsPager) { tab, position ->
             tab.text = if (position == 0) "MJPEG" else "AVC"
         }.attach()
 
-        // restore selected tab from prefs
         val selectedTab = prefs.getInt("selectedTab", 0).coerceIn(0, 1)
-        settingsTabs.getTabAt(selectedTab)?.select()
-
-        // persist tab selection changes
-        settingsTabs.addOnTabSelectedListener(object : com.google.android.material.tabs.TabLayout.OnTabSelectedListener {
-            override fun onTabSelected(tab: com.google.android.material.tabs.TabLayout.Tab?) {
-                try {
-                    prefs.edit().putInt("selectedTab", tab?.position ?: 0).apply()
-                } catch (_: Exception) {}
+        binding.settingsTabLayout.getTabAt(selectedTab)?.select()
+
+        binding.settingsTabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
+            override fun onTabSelected(tab: TabLayout.Tab?) {
+                prefs.edit().putInt("selectedTab", tab?.position ?: 0).apply()
             }
-            override fun onTabUnselected(tab: com.google.android.material.tabs.TabLayout.Tab?) {}
-            override fun onTabReselected(tab: com.google.android.material.tabs.TabLayout.Tab?) {}
+            override fun onTabUnselected(tab: TabLayout.Tab?) {}
+            override fun onTabReselected(tab: TabLayout.Tab?) {}
         })
 
-        startButton.setOnClickListener {
-            val host = hostEdit.text.toString().ifBlank { "0.0.0.0" }
-            val port = portEdit.text.toString().toIntOrNull() ?: DEFAULT_PORT
-            val width = widthEdit.text.toString().toIntOrNull() ?: 1920
-            val height = heightEdit.text.toString().toIntOrNull() ?: 1080
-            val camera = (cameraEdit.tag as? String) ?: cameraEdit.text.toString().ifBlank { "back" }
-            val fps = (fpsSpinner.selectedItem as? String)?.toIntOrNull() ?: 60
-
-            // read codec-specific settings from fragments
-            val mjpegQuality = pagerAdapter?.getMjpegFragment()?.getJpegQuality() ?: 85
-            val avcBitrateMbps = pagerAdapter?.getAvcFragment()?.getBitrateMbps()
-
-            // determine which codec tab is selected
-            val useAvc = settingsTabs.selectedTabPosition == 1
-
-            val jpeg = mjpegQuality
-
-            // Update settings manager
-            settingsManager.setHost(host)
-            settingsManager.setPort(port)
-            settingsManager.setWidth(width)
-            settingsManager.setHeight(height)
-            settingsManager.setCamera(camera)
-            settingsManager.setJpegQuality(jpeg)
-            settingsManager.setFps(fps)
-            settingsManager.setUseAvc(useAvc)
-
-            // save current settings to prefs
-            try {
-                val p = getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit()
-                p.putString("host", host)
-                p.putInt("port", port)
-                p.putInt("width", width)
-                p.putInt("height", height)
-                p.putString("camera", camera)
-                p.putInt("jpegQuality", jpeg)
-                p.putInt("fps", fps)
-                p.putBoolean("useAvc", useAvc)
-                if (avcBitrateMbps != null) p.putFloat("avcMbps", avcBitrateMbps)
-                p.apply()
-            } catch (_: Exception) {}
-
-            if (!isStreaming) {
-                // queue start params and ask for any missing permissions; auto-start when granted
-                val b = android.os.Bundle()
-                b.putString("host", host)
-                b.putInt("port", port)
-                b.putInt("width", width)
-                b.putInt("height", height)
-                b.putString("camera", camera)
-                b.putInt("jpegQuality", jpeg)
-                b.putInt("fps", fps)
-                b.putBoolean("useAvc", useAvc)
-                pendingStartBundle = b
-                val startedImmediately = ensurePermissionsAndStart(host, port, width, height, camera, jpeg, fps, useAvc)
-                if (startedImmediately) {
-                    // optimistic UI update; service will also broadcast state
-                    isStreaming = true
-                    startButton.text = "Stop Server"
-                    settingsManager.setStreaming(true)
-                }
-            } else {
-                stopStreaming()
-                startButton.text = "Start Server"
-                isStreaming = false
-                settingsManager.setStreaming(false)
-                pendingStartBundle = null
-            }
+        binding.startButton.setOnClickListener {
+            handleStartStopClick()
         }
 
-        // Launch preview activity
-        previewButton.setOnClickListener {
-            // open preview without stopping the streaming service
+        binding.previewButton.setOnClickListener {
             startActivity(Intent(this, CameraControlActivity::class.java))
         }
-        // initialize startButton from saved streaming state and register receiver
+
         val wasStreaming = prefs.getBoolean("isStreaming", false)
         isStreaming = wasStreaming
-        startButton.text = if (isStreaming) "Stop Server" else "Start Server"
+        binding.startButton.text = if (isStreaming) getString(R.string.stop_server) else getString(R.string.start_server)
+        binding.previewButton.visibility = if (isStreaming) android.view.View.VISIBLE else android.view.View.GONE
 
-        streamStateReceiver = object : android.content.BroadcastReceiver() {
-            override fun onReceive(context: Context?, intent: Intent?) {
-                val running = intent?.getBooleanExtra("isStreaming", false) ?: false
-                runOnUiThread {
-                    isStreaming = running
-                    startButton.text = if (running) "Stop Server" else "Start Server"
-                }
-            }
-        }
-        // register as not exported to comply with Android 14+ receiver requirements
-        registerReceiver(streamStateReceiver, android.content.IntentFilter("com.example.handycam.STREAM_STATE"), Context.RECEIVER_NOT_EXPORTED)
+        registerStreamStateReceiver()
         
-        // HTTPS Server controls
         val httpsRunning = prefs.getBoolean("httpsServerRunning", false)
         isHttpsServerRunning = httpsRunning
-        httpsServerButton.text = if (httpsRunning) "Stop HTTPS Server" else "Start HTTPS Server"
-        httpsServerStatus.text = if (httpsRunning) {
+        binding.httpsServerButton.text = if (httpsRunning) getString(R.string.stop_https_server) else getString(R.string.start_https_server)
+        binding.httpsServerStatus.text = if (httpsRunning) {
             val port = prefs.getInt("httpsServerPort", 8443)
-            "Server running on port $port"
+            getString(R.string.server_running_on_port, port)
         } else {
-            "Server stopped"
+            getString(R.string.server_stopped)
         }
         
-        httpsServerButton.setOnClickListener {
+        binding.httpsServerButton.setOnClickListener {
             if (isHttpsServerRunning) {
                 stopHttpsServer()
-                // Don't update UI here - let the broadcast receiver handle it
             } else {
-                val port = httpsPortEdit.text.toString().toIntOrNull() ?: 8443
+                val port = binding.httpsPortEdit.text.toString().toIntOrNull() ?: 8443
                 startHttpsServer(port)
-                // Don't update UI here - let the broadcast receiver handle it
             }
         }
         
-        httpsServerStateReceiver = object : android.content.BroadcastReceiver() {
+        registerHttpsServerStateReceiver()
+    }
+
+    private fun setupObservers() {
+        settingsManager.isStreaming.observe(this) { streaming ->
+            binding.startButton.text = if (streaming) getString(R.string.stop_server) else getString(R.string.start_server)
+            isStreaming = streaming
+        }
+        settingsManager.camera.observe(this) { camera ->
+            val cameraLabel = cameraList.find { it.second == camera }?.first
+            binding.cameraDropdown.setText(cameraLabel, false)
+        }
+        settingsManager.port.observe(this) { port ->
+            if (binding.portEdit.text.toString().toIntOrNull() != port) {
+                binding.portEdit.setText(port.toString())
+            }
+        }
+        settingsManager.width.observe(this) { width ->
+            if (binding.widthEdit.text.toString().toIntOrNull() != width) {
+                binding.widthEdit.setText(width.toString())
+            }
+        }
+        settingsManager.height.observe(this) { height ->
+            if (binding.heightEdit.text.toString().toIntOrNull() != height) {
+                binding.heightEdit.setText(height.toString())
+            }
+        }
+        settingsManager.fps.observe(this) { fps ->
+            val fpsChoices = listOf("15", "24", "30", "50", "60")
+            val index = fpsChoices.indexOf(fps.toString())
+            if (index >= 0 && binding.fpsSpinner.selectedItemPosition != index) {
+                binding.fpsSpinner.setSelection(index)
+            }
+        }
+        settingsManager.httpsRunning.observe(this) { httpsRunning ->
+            binding.httpsServerButton.text = if (httpsRunning) getString(R.string.stop_https_server) else getString(R.string.start_https_server)
+            binding.httpsServerStatus.text = if (httpsRunning) {
+                val prefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+                val port = prefs.getInt("httpsServerPort", 8443)
+                "Server running on port $port\nAccess at: https://" + settingsManager.host.value + ":" + settingsManager.port.value
+            } else {
+                getString(R.string.server_stopped)
+            }
+        }
+    }
+
+    private fun populateCameraList(savedCamera: String?) {
+        val cm = getSystemService(Context.CAMERA_SERVICE) as CameraManager
+        cameraList.add(Pair("Back", "back"))
+        cameraList.add(Pair("Front", "front"))
+        cm.cameraIdList.forEach { id ->
+            val chars = cm.getCameraCharacteristics(id)
+            val facing = when (chars.get(CameraCharacteristics.LENS_FACING)) {
+                CameraCharacteristics.LENS_FACING_FRONT -> "front"
+                CameraCharacteristics.LENS_FACING_BACK -> "back"
+                else -> "unknown"
+            }
+            val focalArr = chars.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS)
+            val focalDesc = if (focalArr != null && focalArr.isNotEmpty()) {
+                String.format(Locale.US, "f=%.1fmm", focalArr[0])
+            } else ""
+
+            val label = if (focalDesc.isNotEmpty()) "$id ($facing, $focalDesc)" else "$id ($facing)"
+            cameraList.add(Pair(label, id))
+        }
+
+        val adapter = ArrayAdapter(this, android.R.layout.simple_dropdown_item_1line, cameraList.map { it.first })
+        binding.cameraDropdown.setAdapter(adapter)
+
+        val initialCamera = cameraList.find { it.second == savedCamera } ?: cameraList.first()
+        binding.cameraDropdown.setText(initialCamera.first, false)
+    }
+
+    private fun handleStartStopClick() {
+        val host = binding.hostEdit.text.toString().ifBlank { "0.0.0.0" }
+        val port = binding.portEdit.text.toString().toIntOrNull() ?: DEFAULT_PORT
+        val width = binding.widthEdit.text.toString().toIntOrNull() ?: 1920
+        val height = binding.heightEdit.text.toString().toIntOrNull() ?: 1080
+        val selectedCameraLabel = binding.cameraDropdown.text.toString()
+        val camera = cameraList.find { it.first == selectedCameraLabel }?.second ?: "back"
+        val fps = (binding.fpsSpinner.selectedItem as? String)?.toIntOrNull() ?: 60
+        val mjpegQuality = pagerAdapter?.getMjpegFragment()?.getJpegQuality() ?: 85
+        val avcBitrateMbps = pagerAdapter?.getAvcFragment()?.getBitrateMbps()
+        val useAvc = binding.settingsTabLayout.selectedTabPosition == 1
+
+        settingsManager.setHost(host)
+        settingsManager.setPort(port)
+        settingsManager.setWidth(width)
+        settingsManager.setHeight(height)
+        settingsManager.setCamera(camera)
+        settingsManager.setJpegQuality(mjpegQuality)
+        settingsManager.setFps(fps)
+        settingsManager.setUseAvc(useAvc)
+
+        getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit().apply {
+            putString("host", host)
+            putInt("port", port)
+            putInt("width", width)
+            putInt("height", height)
+            putString("camera", camera)
+            putInt("jpegQuality", mjpegQuality)
+            putInt("fps", fps)
+            putBoolean("useAvc", useAvc)
+            avcBitrateMbps?.let { putFloat("avcMbps", it) }
+            apply()
+        }
+
+        if (!isStreaming) {
+            val b = Bundle().apply {
+                putString("host", host)
+                putInt("port", port)
+                putInt("width", width)
+                putInt("height", height)
+                putString("camera", camera)
+                putInt("jpegQuality", mjpegQuality)
+                putInt("fps", fps)
+                putBoolean("useAvc", useAvc)
+            }
+            pendingStartBundle = b
+            val startedImmediately = ensurePermissionsAndStart(host, port, width, height, camera, mjpegQuality, fps, useAvc)
+            if (startedImmediately) {
+                isStreaming = true
+                binding.startButton.text = getString(R.string.stop_server)
+                settingsManager.setStreaming(true)
+            }
+        } else {
+            stopStreaming()
+            binding.startButton.text = getString(R.string.start_server)
+            isStreaming = false
+            settingsManager.setStreaming(false)
+            pendingStartBundle = null
+        }
+    }
+
+    private fun registerStreamStateReceiver() {
+        streamStateReceiver = object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                val running = intent?.getBooleanExtra("isStreaming", false) ?: false
+                isStreaming = running
+                binding.startButton.text = if (running) getString(R.string.stop_server) else getString(R.string.start_server)
+                binding.previewButton.visibility = if (running) android.view.View.VISIBLE else android.view.View.GONE
+            }
+        }
+        val intentFilter = android.content.IntentFilter("com.example.handycam.STREAM_STATE")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(streamStateReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            registerReceiver(streamStateReceiver, intentFilter, null, null, Context.RECEIVER_NOT_EXPORTED)
+        }
+    }
+
+    private fun registerHttpsServerStateReceiver() {
+        httpsServerStateReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context?, intent: Intent?) {
                 val running = intent?.getBooleanExtra("isRunning", false) ?: false
                 val port = intent?.getIntExtra("port", 8443) ?: 8443
-                runOnUiThread {
-                    isHttpsServerRunning = running
-                    httpsServerButton.text = if (running) "Stop HTTPS Server" else "Start HTTPS Server"
-                    httpsServerStatus.text = if (running) {
-                        "Server running on port $port\nAccess at: http://localhost:$port"
-                    } else {
-                        "Server stopped"
-                    }
+                isHttpsServerRunning = running
+                binding.httpsServerButton.text = if (running) getString(R.string.stop_https_server) else getString(R.string.start_https_server)
+                binding.httpsServerStatus.text = if (running) {
+                    getString(R.string.server_running_on_port_with_access, port, settingsManager.host.value, settingsManager.port.value)
+                } else {
+                    getString(R.string.server_stopped)
                 }
             }
         }
-        registerReceiver(httpsServerStateReceiver, android.content.IntentFilter("com.example.handycam.HTTPS_SERVER_STATE"), Context.RECEIVER_NOT_EXPORTED)
+        val intentFilter = android.content.IntentFilter("com.example.handycam.HTTPS_SERVER_STATE")
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(httpsServerStateReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            registerReceiver(httpsServerStateReceiver, intentFilter, null, null, Context.RECEIVER_NOT_EXPORTED)
+        }
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        try { streamStateReceiver?.let { unregisterReceiver(it) } } catch (_: Exception) {}
-        try { httpsServerStateReceiver?.let { unregisterReceiver(it) } } catch (_: Exception) {}
+        streamStateReceiver?.let { unregisterReceiver(it) }
+        httpsServerStateReceiver?.let { unregisterReceiver(it) }
     }
 
-    // Try to find a reasonable local IPv4 address (prefer private ranges)
     private fun getLocalIpAddress(): String? {
         try {
             val ifaces = NetworkInterface.getNetworkInterfaces()
             val candidates = mutableListOf<String>()
             for (iface in ifaces) {
-                try {
-                    if (!iface.isUp || iface.isLoopback) continue
-                    val addrs = iface.inetAddresses
-                    for (addr in addrs) {
-                        if (addr is Inet4Address && !addr.isLoopbackAddress) {
-                            val host = addr.hostAddress
-                            // prefer typical private ranges first
+                if (!iface.isUp || iface.isLoopback) continue
+                val addrs = iface.inetAddresses
+                for (addr in addrs) {
+                    if (addr is Inet4Address && !addr.isLoopbackAddress) {
+                        val host = addr.hostAddress
+                        if (host != null) {
                             if (host.startsWith("192.") || host.startsWith("10.") || host.startsWith("172.")) return host
                             candidates.add(host)
                         }
                     }
-                } catch (_: Exception) {}
+                }
             }
             if (candidates.isNotEmpty()) return candidates.first()
         } catch (_: Exception) {}
         return null
     }
 
-    // preview binding moved to PreviewActivity
-
     private fun startStreaming(bindHost: String, port: Int, width: Int, height: Int, camera: String, jpegQuality: Int, targetFps: Int, useAvc: Boolean) {
         val intent = Intent(this, StreamService::class.java).apply {
             action = "com.example.handycam.ACTION_START"
@@ -521,16 +381,14 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun ensurePermissionsAndStart(bindHost: String, port: Int, width: Int, height: Int, camera: String, jpegQuality: Int, targetFps: Int, useAvc: Boolean): Boolean {
-        // Ensure CAMERA permission
         val camGranted = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
         if (!camGranted) {
             cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
             return false
         }
 
-        // Ensure FOREGROUND_SERVICE_CAMERA permission (Android 14+ requirement when targeting newer SDKs)
-        val fgPerm = "android.permission.FOREGROUND_SERVICE_CAMERA"
         if (Build.VERSION.SDK_INT >= 34) {
+            val fgPerm = "android.permission.FOREGROUND_SERVICE_CAMERA"
             val fgGranted = ContextCompat.checkSelfPermission(this, fgPerm) == PackageManager.PERMISSION_GRANTED
             if (!fgGranted) {
                 fgCameraPermissionLauncher.launch(fgPerm)
@@ -538,7 +396,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        // Ensure POST_NOTIFICATIONS permission on Android 13+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             val notifGranted = ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
             if (!notifGranted) {
@@ -547,7 +404,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        // All required permissions present — start the service
         startStreaming(bindHost, port, width, height, camera, jpegQuality, targetFps, useAvc)
         return true
     }
diff --git a/app/src/main/java/com/example/handycam/MdnsResponder.kt b/app/src/main/java/com/example/handycam/MdnsResponder.kt
new file mode 100644
index 0000000..a0706fd
--- /dev/null
+++ b/app/src/main/java/com/example/handycam/MdnsResponder.kt
@@ -0,0 +1,201 @@
+package com.example.handycam
+
+import android.content.Context
+import android.net.wifi.WifiManager
+import android.util.Log
+import java.io.ByteArrayOutputStream
+import java.io.DataOutputStream
+import java.net.DatagramPacket
+import java.net.InetAddress
+import java.net.MulticastSocket
+
+private const val MDNS_TAG = "MdnsResponder"
+private const val MDNS_ADDR = "224.0.0.251"
+private const val MDNS_PORT = 5353
+private const val SERVICE_TYPE = "_droidcamobs._tcp.local."
+
+/**
+ * Raw mDNS responder for DroidCam OBS plugin discovery.
+ *
+ * The plugin sends a DNS PTR query with a non-zero query ID, then filters responses
+ * by that same ID. Android NsdManager always responds with ID=0 which gets filtered out.
+ * This class listens on 224.0.0.251:5353 and echoes the query ID back in responses.
+ */
+class MdnsResponder(private val context: Context, private val streamPort: Int) {
+
+    private val deviceName = android.os.Build.MODEL.replace(" ", "_")
+    @Volatile private var socket: MulticastSocket? = null
+    private var thread: Thread? = null
+    private var multicastLock: WifiManager.MulticastLock? = null
+
+    fun start() {
+        val wifi = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        multicastLock = wifi.createMulticastLock("handycam_mdns").apply {
+            setReferenceCounted(true)
+            acquire()
+        }
+        try {
+            val mdnsGroup = InetAddress.getByName(MDNS_ADDR)
+            // reuseAddress must be set BEFORE bind, so use null constructor then bind manually
+            socket = MulticastSocket(null).apply {
+                reuseAddress = true
+                bind(java.net.InetSocketAddress(MDNS_PORT))
+                timeToLive = 255
+                val wifiIface = getWifiInterface()
+                if (wifiIface != null) {
+                    joinGroup(java.net.InetSocketAddress(mdnsGroup, MDNS_PORT), wifiIface)
+                    Log.i(MDNS_TAG, "Joined multicast on ${wifiIface.name}")
+                } else {
+                    joinGroup(mdnsGroup)
+                    Log.w(MDNS_TAG, "Joined multicast on default interface")
+                }
+            }
+            thread = Thread { listen() }.apply {
+                isDaemon = true
+                name = "MdnsResponder"
+                start()
+            }
+            Log.i(MDNS_TAG, "Started, device='$deviceName' port=$streamPort")
+        } catch (e: Exception) {
+            Log.e(MDNS_TAG, "Failed to start", e)
+        }
+    }
+
+    @Suppress("DEPRECATION") // getConnectionInfo deprecated in API 31; fallback handles failure gracefully
+    private fun getWifiInterface(): java.net.NetworkInterface? {
+        return try {
+            val wm = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+            val ip = wm.connectionInfo.ipAddress
+            if (ip == 0) return null
+            val ipBytes = byteArrayOf(
+                (ip and 0xFF).toByte(), (ip shr 8 and 0xFF).toByte(),
+                (ip shr 16 and 0xFF).toByte(), (ip shr 24 and 0xFF).toByte()
+            )
+            java.net.NetworkInterface.getByInetAddress(InetAddress.getByAddress(ipBytes))
+        } catch (e: Exception) {
+            Log.w(MDNS_TAG, "Could not find WiFi interface", e)
+            null
+        }
+    }
+
+    fun stop() {
+        thread?.interrupt()
+        socket?.close()
+        socket = null
+        multicastLock?.release()
+        multicastLock = null
+    }
+
+    private fun listen() {
+        val buf = ByteArray(4096)
+        val sock = socket ?: return
+        while (!Thread.currentThread().isInterrupted) {
+            try {
+                val packet = DatagramPacket(buf, buf.size)
+                sock.receive(packet)
+                handlePacket(packet, sock)
+            } catch (e: Exception) {
+                if (!Thread.currentThread().isInterrupted) Log.e(MDNS_TAG, "Receive error", e)
+                break
+            }
+        }
+    }
+
+    private fun handlePacket(packet: DatagramPacket, sock: MulticastSocket) {
+        val data = packet.data
+        val len = packet.length
+        if (len < 12) return
+        val id = ((data[0].toInt() and 0xFF) shl 8) or (data[1].toInt() and 0xFF)
+        val flags = ((data[2].toInt() and 0xFF) shl 8) or (data[3].toInt() and 0xFF)
+        if (flags and 0x8000 != 0) return // skip responses
+        val qdCount = ((data[4].toInt() and 0xFF) shl 8) or (data[5].toInt() and 0xFF)
+        if (qdCount == 0) return
+        var offset = 12
+        for (i in 0 until qdCount) {
+            val (name, newOffset) = parseName(data, len, offset)
+            if (newOffset + 4 > len) return
+            val qtype = ((data[newOffset].toInt() and 0xFF) shl 8) or (data[newOffset + 1].toInt() and 0xFF)
+            offset = newOffset + 4
+            if ((qtype == 12 || qtype == 255) && name.equals(SERVICE_TYPE, ignoreCase = true)) {
+                Log.d(MDNS_TAG, "Query from ${packet.address.hostAddress} id=$id")
+                sendResponse(id, sock, packet)
+                return
+            }
+        }
+    }
+
+    private fun parseName(data: ByteArray, len: Int, start: Int): Pair<String, Int> {
+        val sb = StringBuilder()
+        var i = start
+        while (i < len) {
+            val labelLen = data[i].toInt() and 0xFF
+            if (labelLen == 0) { i++; break }
+            if (labelLen and 0xC0 == 0xC0) {
+                val ptr = ((labelLen and 0x3F) shl 8) or (data[i + 1].toInt() and 0xFF)
+                val (name, _) = parseName(data, len, ptr)
+                if (sb.isNotEmpty()) sb.append('.')
+                sb.append(name)
+                i += 2; break
+            }
+            if (sb.isNotEmpty()) sb.append('.')
+            sb.append(String(data, i + 1, labelLen))
+            i += labelLen + 1
+        }
+        if (sb.isNotEmpty() && sb.last() != '.') sb.append('.')
+        return Pair(sb.toString(), i)
+    }
+
+    private fun sendResponse(queryId: Int, sock: MulticastSocket, replyTo: DatagramPacket) {
+        val fullName = "$deviceName.$SERVICE_TYPE"
+        val hostName = "$deviceName.local."
+        val out = ByteArrayOutputStream()
+        val dos = DataOutputStream(out)
+
+        // Header: echo back query ID, QR=1 AA=1
+        dos.writeShort(queryId)
+        dos.writeShort(0x8400)
+        dos.writeShort(0)  // QDCOUNT
+        dos.writeShort(1)  // ANCOUNT
+        dos.writeShort(0)  // NSCOUNT
+        dos.writeShort(2)  // ARCOUNT
+
+        // PTR answer
+        writeName(dos, SERVICE_TYPE)
+        dos.writeShort(12); dos.writeShort(1); dos.writeInt(120)
+        val ptrRdata = buildName(fullName)
+        dos.writeShort(ptrRdata.size); dos.write(ptrRdata)
+
+        // TXT additional
+        writeName(dos, fullName)
+        dos.writeShort(16); dos.writeShort(1); dos.writeInt(120)
+        val txtEntry = "name=$deviceName".toByteArray(Charsets.UTF_8)
+        dos.writeShort(txtEntry.size + 1)
+        dos.writeByte(txtEntry.size); dos.write(txtEntry)
+
+        // SRV additional
+        writeName(dos, fullName)
+        dos.writeShort(33); dos.writeShort(1); dos.writeInt(120)
+        val hostBytes = buildName(hostName)
+        dos.writeShort(6 + hostBytes.size)
+        dos.writeShort(0); dos.writeShort(0)  // priority, weight
+        dos.writeShort(streamPort)
+        dos.write(hostBytes)
+
+        val bytes = out.toByteArray()
+        // Send unicast directly back to querier (plugin uses MDNS_UNICAST_RESPONSE flag)
+        sock.send(DatagramPacket(bytes, bytes.size, replyTo.address, replyTo.port))
+        Log.d(MDNS_TAG, "Sent response for '$deviceName'")
+    }
+
+    private fun writeName(dos: DataOutputStream, name: String) = dos.write(buildName(name))
+
+    private fun buildName(name: String): ByteArray {
+        val out = ByteArrayOutputStream()
+        for (label in name.trimEnd('.').split('.')) {
+            val bytes = label.toByteArray(Charsets.UTF_8)
+            out.write(bytes.size); out.write(bytes)
+        }
+        out.write(0)
+        return out.toByteArray()
+    }
+}
diff --git a/app/src/main/java/com/example/handycam/SettingsManager.kt b/app/src/main/java/com/example/handycam/SettingsManager.kt
index eca2a7b..7787426 100644
--- a/app/src/main/java/com/example/handycam/SettingsManager.kt
+++ b/app/src/main/java/com/example/handycam/SettingsManager.kt
@@ -75,6 +75,15 @@ class SettingsManager private constructor(context: Context) {
     private val _autoExposure = MutableLiveData<Boolean>(true)
     val autoExposure: LiveData<Boolean> get() = _autoExposure
 
+    // Zoom (linear 0.0 to 1.0, where 0 = min zoom, 1 = max zoom)
+    private val _zoom = MutableLiveData<Float>(0f)
+    val zoom: LiveData<Float> get() = _zoom
+
+    // White balance mode (Camera2 CaptureRequest.CONTROL_AWB_MODE_* constants)
+    // 1=Auto, 2=Daylight, 3=Incandescent, 4=Fluorescent, 8=Cloudy, 9=Shade
+    private val _whiteBalance = MutableLiveData<Int>(1)
+    val whiteBalance: LiveData<Int> get() = _whiteBalance
+
     // Update methods
     fun setStreaming(value: Boolean) {
         if (Looper.myLooper() == Looper.getMainLooper()) _isStreaming.value = value else _isStreaming.postValue(value)
@@ -136,4 +145,13 @@ class SettingsManager private constructor(context: Context) {
     fun setAutoExposure(value: Boolean) {
         if (Looper.myLooper() == Looper.getMainLooper()) _autoExposure.value = value else _autoExposure.postValue(value)
     }
+
+    fun setZoom(value: Float) {
+        val v = value.coerceIn(0f, 1f)
+        if (Looper.myLooper() == Looper.getMainLooper()) _zoom.value = v else _zoom.postValue(v)
+    }
+
+    fun setWhiteBalance(mode: Int) {
+        if (Looper.myLooper() == Looper.getMainLooper()) _whiteBalance.value = mode else _whiteBalance.postValue(mode)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/handycam/StreamService.kt b/app/src/main/java/com/example/handycam/StreamService.kt
index 1b16983..376845f 100644
--- a/app/src/main/java/com/example/handycam/StreamService.kt
+++ b/app/src/main/java/com/example/handycam/StreamService.kt
@@ -44,7 +44,6 @@ import android.view.Surface
 import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CameraAccessException
 import android.graphics.SurfaceTexture
-
 private const val TAG = "StreamService"
 private const val CHANNEL_ID = "handycam_stream"
 private const val NOTIF_ID = 1001
@@ -99,6 +98,9 @@ class StreamService : LifecycleService() {
     private var previewUseCase: androidx.camera.core.Preview? = null
     private lateinit var settingsManager: SettingsManager
 
+    // mDNS / NSD for DroidCam OBS plugin discovery
+    private var mdnsResponder: MdnsResponder? = null
+
     override fun onCreate() {
         super.onCreate()
         createNotificationChannel()
@@ -117,6 +119,12 @@ class StreamService : LifecycleService() {
             settingsManager.autoFocus.observe(this) { af ->
                 try { applyAutoFocus(af) } catch (e: Exception) { Log.e(TAG, "applyAutoFocus observer error", e) }
             }
+            settingsManager.zoom.observe(this) { v ->
+                try { applyZoom(v) } catch (e: Exception) { Log.e(TAG, "applyZoom observer error", e) }
+            }
+            settingsManager.whiteBalance.observe(this) { v ->
+                try { applyWhiteBalance(v) } catch (e: Exception) { Log.e(TAG, "applyWhiteBalance observer error", e) }
+            }
         } catch (_: Exception) {}
     }
 
@@ -162,6 +170,7 @@ class StreamService : LifecycleService() {
                     return START_NOT_STICKY
                 }
                 startStreaming(host, port, width, height, selectedCamera, jpegQuality, targetFps, useAvc)
+                registerMdns(port)
                 // notify UI and persist state that streaming started
                 try {
                     notifyStreamingState(true)
@@ -189,6 +198,7 @@ class StreamService : LifecycleService() {
             }
             ACTION_STOP -> {
                 settingsManager.setStreaming(false)
+                unregisterMdns()
                 stopStreaming()
                 stopForeground(true)
                 stopSelf()
@@ -205,6 +215,11 @@ class StreamService : LifecycleService() {
         return null
     }
 
+    override fun onDestroy() {
+        unregisterMdns()
+        super.onDestroy()
+    }
+
     private fun buildNotification(text: String) = run {
         // content intent: opens the main activity when the notification is tapped
         val openIntent = Intent(this, MainActivity::class.java).apply {
@@ -392,6 +407,82 @@ class StreamService : LifecycleService() {
         }
     }
 
+    private fun applyZoom(linearZoom: Float) {
+        try {
+            if (!useAvc) {
+                SharedSurfaceProvider.cameraControl?.setLinearZoom(linearZoom)
+                Log.i(TAG, "Applied zoom via CameraControl: $linearZoom")
+            } else {
+                cameraHandler?.post {
+                    try {
+                        val cam = cameraDevice ?: return@post
+                        val session = captureSession ?: return@post
+                        val camId = findCameraId(selectedCamera) ?: return@post
+                        val chars = cameraManager?.getCameraCharacteristics(camId) ?: return@post
+                        val sensorSize = chars.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE) ?: return@post
+                        val maxZoom = chars.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 1f
+                        val zoomRatio = 1f + (maxZoom - 1f) * linearZoom
+                        val cropW = (sensorSize.width() / zoomRatio).toInt()
+                        val cropH = (sensorSize.height() / zoomRatio).toInt()
+                        val cropX = (sensorSize.width() - cropW) / 2
+                        val cropY = (sensorSize.height() - cropH) / 2
+                        val cropRegion = android.graphics.Rect(cropX, cropY, cropX + cropW, cropY + cropH)
+                        val builder = cam.createCaptureRequest(CameraDevice.TEMPLATE_RECORD)
+                        encoderInputSurface?.let { builder.addTarget(it) }
+                        imageReader?.surface?.let { builder.addTarget(it) }
+                        SharedSurfaceProvider.previewSurface?.let { builder.addTarget(it) }
+                        builder.set(CaptureRequest.SCALER_CROP_REGION, cropRegion)
+                        session.setRepeatingRequest(builder.build(), null, cameraHandler)
+                        Log.i(TAG, "Applied zoom via Camera2: ratio=$zoomRatio")
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Failed to apply zoom on Camera2", e)
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "applyZoom error", e)
+        }
+    }
+
+    private fun applyWhiteBalance(mode: Int) {
+        try {
+            if (!useAvc) {
+                Log.i(TAG, "WB change requested for CameraX path (no-op without Camera2Interop)")
+            } else {
+                cameraHandler?.post {
+                    try {
+                        val cam = cameraDevice ?: return@post
+                        val session = captureSession ?: return@post
+                        val builder = cam.createCaptureRequest(CameraDevice.TEMPLATE_RECORD)
+                        encoderInputSurface?.let { builder.addTarget(it) }
+                        imageReader?.surface?.let { builder.addTarget(it) }
+                        SharedSurfaceProvider.previewSurface?.let { builder.addTarget(it) }
+                        builder.set(CaptureRequest.CONTROL_AWB_MODE, mode)
+                        session.setRepeatingRequest(builder.build(), null, cameraHandler)
+                        Log.i(TAG, "Applied WB via Camera2: mode=$mode")
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Failed to apply WB on Camera2", e)
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "applyWhiteBalance error", e)
+        }
+    }
+
+    private fun registerMdns(port: Int) {
+        try {
+            mdnsResponder = MdnsResponder(this, port).also { it.start() }
+        } catch (e: Exception) {
+            Log.e(TAG, "mDNS start error", e)
+        }
+    }
+
+    private fun unregisterMdns() {
+        mdnsResponder?.stop()
+        mdnsResponder = null
+    }
+
     private fun createNotificationChannel() {
         // Create the NotificationChannel, but only on API 26+ because
         // the NotificationChannel class is not in the Support Library.
@@ -412,19 +503,22 @@ class StreamService : LifecycleService() {
     private fun startStreaming(bindHost: String, port: Int, width: Int, height: Int, camera: String, jpegQ: Int, fps: Int, useAvcFlag: Boolean) {
         if (running) return
         running = true
+        // Always stream in landscape — swap if portrait dimensions were passed
+        val w = maxOf(width, height)
+        val h = minOf(width, height)
         // store runtime options
         selectedCamera = camera
         jpegQuality = jpegQ
         targetFps = fps
         useAvc = useAvcFlag
-        requestedWidth = width
-        requestedHeight = height
+        requestedWidth = w
+        requestedHeight = h
 
         if (useAvc) {
             // Start Camera2 -> encoder pipeline. The helper will pick a supported
             // camera output size and call setupEncoder(...) with a compatible size.
             try {
-                startCamera2ToEncoder(width, height, targetFps)
+                startCamera2ToEncoder(w, h, targetFps)
                 startEncoderOutputReader()
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to initialize encoder or camera2 pipeline", e)
@@ -450,7 +544,10 @@ class StreamService : LifecycleService() {
                 this@StreamService.cameraProvider = cameraProvider
 
                 val analysisUseCase = ImageAnalysis.Builder()
-                    .setTargetResolution(android.util.Size(width, height))
+                    // Lock to ROTATION_90 so CameraX interprets dimensions in sensor/landscape
+                    // space regardless of phone orientation — ensures consistent landscape output
+                    .setTargetRotation(android.view.Surface.ROTATION_90)
+                    .setTargetResolution(android.util.Size(w, h))
                     .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
                     .build()
 
@@ -908,20 +1005,26 @@ class StreamService : LifecycleService() {
         var chosenHeight = reqHeight
         try {
             val chars = cameraManager?.getCameraCharacteristics(camId)
+            // Camera2 output sizes are always in sensor (landscape) orientation.
+            // Swap the requested dimensions so we find the right match.
+            val sensorOrientation = chars?.get(CameraCharacteristics.SENSOR_ORIENTATION) ?: 0
+            val swapDimensions = sensorOrientation == 90 || sensorOrientation == 270
+            val nativeReqWidth  = if (swapDimensions && reqWidth < reqHeight) reqHeight else reqWidth
+            val nativeReqHeight = if (swapDimensions && reqWidth < reqHeight) reqWidth  else reqHeight
             val map = chars?.get(android.hardware.camera2.CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
             if (map != null) {
                 val sizes = map.getOutputSizes(SurfaceTexture::class.java)
                 if (sizes != null && sizes.isNotEmpty()) {
-                    // find exact match or choose closest by area
+                    // find exact match or choose closest by area preserving aspect ratio
                     var chosen = sizes[0]
-                    var bestDiff = Math.abs(chosen.width * chosen.height - reqWidth * reqHeight)
+                    var bestDiff = Math.abs(chosen.width * chosen.height - nativeReqWidth * nativeReqHeight)
                     for (s in sizes) {
-                        if (s.width == reqWidth && s.height == reqHeight) {
+                        if (s.width == nativeReqWidth && s.height == nativeReqHeight) {
                             chosen = s
                             bestDiff = 0
                             break
                         }
-                        val diff = Math.abs(s.width * s.height - reqWidth * reqHeight)
+                        val diff = Math.abs(s.width * s.height - nativeReqWidth * nativeReqHeight)
                         if (diff < bestDiff) {
                             bestDiff = diff
                             chosen = s
diff --git a/app/src/main/java/com/example/handycam/data/model/StreamConfig.kt b/app/src/main/java/com/example/handycam/data/model/StreamConfig.kt
index aa57062..fe16cd8 100644
--- a/app/src/main/java/com/example/handycam/data/model/StreamConfig.kt
+++ b/app/src/main/java/com/example/handycam/data/model/StreamConfig.kt
@@ -7,6 +7,7 @@ package com.example.handycam.data.model
 data class StreamConfig(
     val width: Int = 1080,
     val height: Int = 1920,
+    val camera: String = "back",
     val jpegQuality: Int = 85,
     val fps: Int = 60,
     val useAvc: Boolean = false,
diff --git a/app/src/main/java/com/example/handycam/presentation/main/MainActivityNew.kt b/app/src/main/java/com/example/handycam/presentation/main/MainActivityNew.kt
index d8c4ecc..185f9f5 100644
--- a/app/src/main/java/com/example/handycam/presentation/main/MainActivityNew.kt
+++ b/app/src/main/java/com/example/handycam/presentation/main/MainActivityNew.kt
@@ -5,7 +5,9 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -14,35 +16,20 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import com.example.handycam.CameraControlActivity
-import com.example.handycam.R
 import com.example.handycam.SettingsPagerAdapter
+import com.example.handycam.data.model.CameraInfo
+import com.example.handycam.databinding.ActivityMainBinding
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 
-/**
- * Refactored MainActivity using MVVM architecture.
- * All business logic moved to MainViewModel.
- * Uses DataStore for preferences (replaced SharedPreferences).
- */
 @AndroidEntryPoint
-class MainActivity : AppCompatActivity() {
+class MainActivityNew : AppCompatActivity() {
 
     private val viewModel: MainViewModel by viewModels()
-
-    // UI components
-    private lateinit var hostEdit: EditText
-    private lateinit var portEdit: EditText
-    private lateinit var widthEdit: EditText
-    private lateinit var heightEdit: EditText
-    private lateinit var cameraEdit: EditText
-    private lateinit var cameraListLayout: LinearLayout
-    private lateinit var fpsSpinner: Spinner
-    private lateinit var startButton: Button
-    private lateinit var previewButton: Button
-    private lateinit var settingsPager: androidx.viewpager2.widget.ViewPager2
-    private lateinit var settingsTabs: com.google.android.material.tabs.TabLayout
+    private lateinit var binding: ActivityMainBinding
 
     private var pendingStartBundle: Bundle? = null
+    private val cameraList = mutableListOf<CameraInfo>()
 
     private val cameraPermissionLauncher = registerForActivityResult(
         ActivityResultContracts.RequestPermission()
@@ -64,7 +51,10 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        setSupportActionBar(binding.toolbar)
 
         initializeViews()
         setupObservers()
@@ -73,28 +63,16 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun initializeViews() {
-        hostEdit = findViewById(R.id.hostEdit)
-        portEdit = findViewById(R.id.portEdit)
-        widthEdit = findViewById(R.id.widthEdit)
-        heightEdit = findViewById(R.id.heightEdit)
-        cameraEdit = findViewById(R.id.cameraEdit)
-        cameraListLayout = findViewById(R.id.cameraListLayout)
-        fpsSpinner = findViewById(R.id.fpsSpinner)
-        startButton = findViewById(R.id.startButton)
-        previewButton = findViewById(R.id.previewButton)
-        settingsPager = findViewById(R.id.settingsPager)
-        settingsTabs = findViewById(R.id.settingsTabLayout)
-
         // Setup FPS spinner
         val fpsChoices = listOf("15", "24", "30", "50", "60")
         val fpsAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, fpsChoices).apply {
             setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         }
-        fpsSpinner.adapter = fpsAdapter
+        binding.fpsSpinner.adapter = fpsAdapter
 
         // Setup settings pager
-        settingsPager.adapter = SettingsPagerAdapter(this)
-        com.google.android.material.tabs.TabLayoutMediator(settingsTabs, settingsPager) { tab, position ->
+        binding.settingsPager.adapter = SettingsPagerAdapter(this)
+        com.google.android.material.tabs.TabLayoutMediator(binding.settingsTabLayout, binding.settingsPager) { tab, position ->
             tab.text = if (position == 0) "MJPEG" else "AVC"
         }.attach()
     }
@@ -102,56 +80,56 @@ class MainActivity : AppCompatActivity() {
     private fun setupObservers() {
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
-                // Observe app settings
                 launch {
                     viewModel.appSettings.collect { settings ->
-                        hostEdit.setText(settings.host)
-                        portEdit.setText(settings.port.toString())
+                        binding.hostEdit.setText(settings.host)
+                        binding.portEdit.setText(settings.port.toString())
                         updateStreamingButton(settings.isStreaming)
                     }
                 }
 
-                // Observe stream config
                 launch {
                     viewModel.streamConfig.collect { config ->
-                        widthEdit.setText(config.width.toString())
-                        heightEdit.setText(config.height.toString())
-                        
+                        binding.widthEdit.setText(config.width.toString())
+                        binding.heightEdit.setText(config.height.toString())
+
+                        val cameraLabel = cameraList.find { it.id == config.camera }?.displayName
+                        if (cameraLabel != null) {
+                            binding.cameraDropdown.setText(cameraLabel, false)
+                        }
+
                         val fpsChoices = listOf("15", "24", "30", "50", "60")
                         val fpsIndex = fpsChoices.indexOf(config.fps.toString()).coerceAtLeast(0)
-                        fpsSpinner.setSelection(fpsIndex)
+                        binding.fpsSpinner.setSelection(fpsIndex)
                     }
                 }
 
-                // Observe available cameras
                 launch {
                     viewModel.availableCameras.collect { cameras ->
                         populateCameraList(cameras)
                     }
                 }
 
-                // Observe stream state
                 launch {
                     viewModel.streamState.collect { state ->
                         updateStreamingButton(state.isActive)
                         if (state.error != null) {
-                            Toast.makeText(this@MainActivity, state.error, Toast.LENGTH_SHORT).show()
+                            Toast.makeText(this@MainActivityNew, state.error, Toast.LENGTH_SHORT).show()
                         }
                     }
                 }
 
-                // Observe UI events
                 launch {
                     viewModel.uiEvent.collect { event ->
                         when (event) {
                             is MainViewModel.UiEvent.StreamStarted -> {
-                                Toast.makeText(this@MainActivity, "Stream started", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(this@MainActivityNew, "Stream started", Toast.LENGTH_SHORT).show()
                             }
                             is MainViewModel.UiEvent.StreamStopped -> {
-                                Toast.makeText(this@MainActivity, "Stream stopped", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(this@MainActivityNew, "Stream stopped", Toast.LENGTH_SHORT).show()
                             }
                             is MainViewModel.UiEvent.Error -> {
-                                Toast.makeText(this@MainActivity, event.message, Toast.LENGTH_LONG).show()
+                                Toast.makeText(this@MainActivityNew, event.message, Toast.LENGTH_LONG).show()
                             }
                         }
                     }
@@ -161,7 +139,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun setupListeners() {
-        startButton.setOnClickListener {
+        binding.startButton.setOnClickListener {
             val isCurrentlyStreaming = viewModel.streamState.value.isActive
             if (isCurrentlyStreaming) {
                 viewModel.stopStreaming()
@@ -170,36 +148,32 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        previewButton.setOnClickListener {
+        binding.previewButton.setOnClickListener {
             startActivity(Intent(this, CameraControlActivity::class.java))
         }
 
-        // Save host when it changes
-        hostEdit.setOnFocusChangeListener { _, hasFocus ->
+        binding.hostEdit.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) {
-                viewModel.updateHost(hostEdit.text.toString())
+                viewModel.updateHost(binding.hostEdit.text.toString())
             }
         }
 
-        // Save port when it changes
-        portEdit.setOnFocusChangeListener { _, hasFocus ->
+        binding.portEdit.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) {
-                portEdit.text.toString().toIntOrNull()?.let { port ->
-                    viewModel.updatePort(port)
+                binding.portEdit.text.toString().toIntOrNull()?.let {
+                    viewModel.updatePort(it)
                 }
             }
         }
 
-        // Save resolution when it changes
-        widthEdit.setOnFocusChangeListener { _, hasFocus ->
+        binding.widthEdit.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) updateResolution()
         }
-        heightEdit.setOnFocusChangeListener { _, hasFocus ->
+        binding.heightEdit.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) updateResolution()
         }
 
-        // Save FPS when it changes
-        fpsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        binding.fpsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>?, view: android.view.View?, position: Int, id: Long) {
                 val fps = parent?.getItemAtPosition(position).toString().toIntOrNull() ?: 60
                 viewModel.updateFps(fps)
@@ -207,77 +181,48 @@ class MainActivity : AppCompatActivity() {
 
             override fun onNothingSelected(parent: AdapterView<*>?) {}
         }
-    }
 
-    private fun populateCameraList(cameras: List<com.example.handycam.data.model.CameraInfo>) {
-        cameraListLayout.removeAllViews()
-
-        // Add logical camera buttons
-        val backBtn = Button(this).apply {
-            text = "back"
-            setOnClickListener {
-                if (viewModel.streamState.value.isActive) {
-                    viewModel.switchCamera("back")
-                } else {
-                    cameraEdit.setText("back")
-                    viewModel.updateHost("back")
-                }
-            }
-        }
-        cameraListLayout.addView(backBtn)
-
-        val frontBtn = Button(this).apply {
-            text = "front"
-            setOnClickListener {
-                if (viewModel.streamState.value.isActive) {
-                    viewModel.switchCamera("front")
-                } else {
-                    cameraEdit.setText("front")
-                    viewModel.updateHost("front")
-                }
+        binding.cameraDropdown.onItemClickListener = AdapterView.OnItemClickListener { parent, _, position, _ ->
+            val selectedLabel = parent.getItemAtPosition(position).toString()
+            cameraList.find { it.displayName == selectedLabel }?.let {
+                viewModel.updateCamera(it.id)
             }
         }
-        cameraListLayout.addView(frontBtn)
-
-        // Add physical camera buttons
-        cameras.forEach { camera ->
-            val btn = Button(this).apply {
-                text = "${camera.displayName}${camera.focalLength?.let { " $it" } ?: ""}"
-                setOnClickListener {
-                    if (viewModel.streamState.value.isActive) {
-                        viewModel.switchCamera(camera.id)
-                    } else {
-                        cameraEdit.setText(camera.id)
-                        viewModel.updateHost(camera.id)
-                    }
-                }
-            }
-            cameraListLayout.addView(btn)
+    }
+
+    private fun populateCameraList(cameras: List<CameraInfo>) {
+        cameraList.clear()
+        cameraList.addAll(cameras)
+
+        val cameraLabels = cameras.map { it.displayName }
+        val adapter = ArrayAdapter(this, android.R.layout.simple_dropdown_item_1line, cameraLabels)
+        binding.cameraDropdown.setAdapter(adapter)
+
+        val currentCameraId = viewModel.streamConfig.value.camera
+        val currentCamera = cameras.find { it.id == currentCameraId }
+        if (currentCamera != null) {
+            binding.cameraDropdown.setText(currentCamera.displayName, false)
         }
     }
 
     private fun handleStartStreaming() {
-        val host = hostEdit.text.toString()
-        val port = portEdit.text.toString().toIntOrNull() ?: 4747
-        val width = widthEdit.text.toString().toIntOrNull() ?: 1080
-        val height = heightEdit.text.toString().toIntOrNull() ?: 1920
-        val camera = cameraEdit.text.toString().ifEmpty { "back" }
-        val fps = fpsSpinner.selectedItem.toString().toIntOrNull() ?: 60
-
-        // Get settings from fragments
-        val useAvc = settingsPager.currentItem == 1
+        val host = binding.hostEdit.text.toString()
+        val port = binding.portEdit.text.toString().toIntOrNull() ?: 4747
+        val width = binding.widthEdit.text.toString().toIntOrNull() ?: 1080
+        val height = binding.heightEdit.text.toString().toIntOrNull() ?: 1920
+        val selectedCameraLabel = binding.cameraDropdown.text.toString()
+        val camera = cameraList.find { it.displayName == selectedCameraLabel }?.id ?: "back"
+        val fps = binding.fpsSpinner.selectedItem.toString().toIntOrNull() ?: 60
+
+        val useAvc = binding.settingsPager.currentItem == 1
         val jpegQuality = if (!useAvc) {
-            (settingsPager.adapter as? SettingsPagerAdapter)?.getMjpegFragment()?.getJpegQuality() ?: 85
-        } else {
-            85
-        }
+            (binding.settingsPager.adapter as? SettingsPagerAdapter)?.getMjpegFragment()?.getJpegQuality() ?: 85
+        } else 85
         val avcBitrate = if (useAvc) {
-            (settingsPager.adapter as? SettingsPagerAdapter)?.getAvcFragment()?.getBitrateMbps()?.let { 
+            (binding.settingsPager.adapter as? SettingsPagerAdapter)?.getAvcFragment()?.getBitrateMbps()?.let {
                 (it * 1_000_000).toInt()
             }
-        } else {
-            null
-        }
+        } else null
 
         pendingStartBundle = Bundle().apply {
             putString("host", host)
@@ -295,13 +240,11 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun requestPermissionsAndStart() {
-        // Check camera permission
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
             cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
             return
         }
 
-        // Check foreground service permission (Android 14+)
         if (Build.VERSION.SDK_INT >= 34) {
             val fgPerm = "android.permission.FOREGROUND_SERVICE_CAMERA"
             if (ContextCompat.checkSelfPermission(this, fgPerm) != PackageManager.PERMISSION_GRANTED) {
@@ -310,7 +253,6 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        // Check notification permission (Android 13+)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
                 notifPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
@@ -324,7 +266,6 @@ class MainActivity : AppCompatActivity() {
     private fun tryStartPendingIfPermsGranted() {
         val bundle = pendingStartBundle ?: return
 
-        // Check all permissions are granted
         val camGranted = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
         val fgGranted = if (Build.VERSION.SDK_INT >= 34) {
             ContextCompat.checkSelfPermission(this, "android.permission.FOREGROUND_SERVICE_CAMERA") == PackageManager.PERMISSION_GRANTED
@@ -356,12 +297,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun updateStreamingButton(isStreaming: Boolean) {
-        startButton.text = if (isStreaming) "Stop Server" else "Start Server"
+        binding.startButton.text = if (isStreaming) "Stop Server" else "Start Server"
+        binding.previewButton.visibility = if (isStreaming) android.view.View.VISIBLE else android.view.View.GONE
     }
 
     private fun updateResolution() {
-        val width = widthEdit.text.toString().toIntOrNull() ?: 1080
-        val height = heightEdit.text.toString().toIntOrNull() ?: 1920
+        val width = binding.widthEdit.text.toString().toIntOrNull() ?: 1080
+        val height = binding.heightEdit.text.toString().toIntOrNull() ?: 1920
         viewModel.updateResolution(width, height)
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/handycam/presentation/main/MainViewModel.kt b/app/src/main/java/com/example/handycam/presentation/main/MainViewModel.kt
index dc91399..cb5069d 100644
--- a/app/src/main/java/com/example/handycam/presentation/main/MainViewModel.kt
+++ b/app/src/main/java/com/example/handycam/presentation/main/MainViewModel.kt
@@ -139,6 +139,12 @@ class MainViewModel @Inject constructor(
         }
     }
 
+    fun updateCamera(camera: String) {
+        viewModelScope.launch {
+            settingsRepository.updateCamera(camera)
+        }
+    }
+
     fun updateHost(host: String) {
         viewModelScope.launch {
             settingsRepository.updateHost(host)
diff --git a/app/src/main/res/layout/activity_camera_control.xml b/app/src/main/res/layout/activity_camera_control.xml
index 73e70d1..68bf3ba 100644
--- a/app/src/main/res/layout/activity_camera_control.xml
+++ b/app/src/main/res/layout/activity_camera_control.xml
@@ -65,4 +65,36 @@
         android:translationX="0dp"
         android:translationY="0dp" />
 
+    <!-- Bottom: zoom label + slider -->
+    <LinearLayout
+        android:id="@+id/bottomControls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:background="#AA000000"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="10dp">
+
+        <TextView
+            android:id="@+id/zoomLabel"
+            android:layout_width="44dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="#FFFFFF"
+            android:textSize="13sp"
+            android:text="1.0x" />
+
+        <SeekBar
+            android:id="@+id/zoomSeekBar"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:max="100"
+            android:progress="0"
+            android:paddingVertical="10dp" />
+
+    </LinearLayout>
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f0f7469..59fe78b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,145 +1,226 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp">
+    android:fitsSystemWindows="true"
+    tools:context=".MainActivity">
 
-    <LinearLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-
-        <EditText
-            android:id="@+id/hostEdit"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Bind host (0.0.0.0)"
-            android:inputType="text" />
+            android:layout_height="?attr/actionBarSize"
+            app:title="@string/app_name" />
 
-        <EditText
-            android:id="@+id/portEdit"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Port"
-            android:inputType="number" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-        <LinearLayout
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:padding="16dp">
 
-            <EditText
-                android:id="@+id/widthEdit"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/hostInputLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:hint="Bind host (0.0.0.0)"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/hostEdit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/portInputLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:hint="Port"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/hostInputLayout">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/portEdit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="number" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/widthInputLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="4dp"
                 android:hint="Width"
-                android:inputType="number" />
-
-            <EditText
-                android:id="@+id/heightEdit"
+                app:layout_constraintEnd_toStartOf="@+id/heightInputLayout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/portInputLayout">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/widthEdit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="number" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/heightInputLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="8dp"
                 android:hint="Height"
-                android:inputType="number"
-                android:layout_marginStart="8dp" />
-        </LinearLayout>
-
-        <EditText
-            android:id="@+id/cameraEdit"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="Camera (id or back/front)"
-            android:inputType="text" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Available:" />
-
-        <LinearLayout
-            android:id="@+id/cameraListLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
-
-        <!-- Tabs for codec-specific settings -->
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/settingsTabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp" />
-
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/settingsPager"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal" />
-
-        <Spinner
-            android:id="@+id/fpsSpinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp" />
-
-        <Button
-            android:id="@+id/startButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Start Server"
-            android:layout_marginTop="12dp" />
-
-        <Button
-            android:id="@+id/previewButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Control Camera"
-            android:layout_marginTop="8dp" />
-
-        <!-- HTTPS Server Section -->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginBottom="16dp"
-            android:background="#CCCCCC" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="HTTPS Server"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            android:layout_marginBottom="8dp" />
-
-        <EditText
-            android:id="@+id/httpsPortEdit"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="HTTPS Port (default: 8443)"
-            android:inputType="number"
-            android:text="8443" />
-
-        <Button
-            android:id="@+id/httpsServerButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Start HTTPS Server"
-            android:layout_marginTop="8dp" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/widthInputLayout"
+                app:layout_constraintTop_toBottomOf="@id/portInputLayout">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/heightEdit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="number" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/cameraDropdownLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:hint="Camera"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/widthInputLayout">
+
+                <AutoCompleteTextView
+                    android:id="@+id/cameraDropdown"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="none" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/settingsTabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                app:layout_constraintTop_toBottomOf="@id/cameraDropdownLayout" />
 
-        <TextView
-            android:id="@+id/httpsServerStatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Server stopped"
-            android:textAlignment="center"
-            android:layout_marginTop="8dp"
-            android:textColor="#666666" />
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/settingsPager"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:orientation="horizontal"
+                app:layout_constraintTop_toBottomOf="@id/settingsTabLayout" />
 
-    </LinearLayout>
-</ScrollView>
+            <Spinner
+                android:id="@+id/fpsSpinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:layout_constraintTop_toBottomOf="@id/settingsPager" />
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/startButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/start_server"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/fpsSpinner" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/previewButton"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="Control Camera"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/startButton" />
+
+            <View
+                android:id="@+id/divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="16dp"
+                android:background="?android:attr/listDivider"
+                app:layout_constraintTop_toBottomOf="@id/previewButton" />
+
+            <TextView
+                android:id="@+id/httpsServerLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="HTTPS Server"
+                android:textAppearance="?attr/textAppearanceHeadline6"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/divider" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/httpsPortInputLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:hint="HTTPS Port (default: 8443)"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/httpsServerLabel">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/httpsPortEdit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="number"
+                    android:text="8443" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/httpsServerButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/start_https_server"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/httpsPortInputLayout" />
+
+            <TextView
+                android:id="@+id/httpsServerStatus"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/server_stopped"
+                android:textAlignment="center"
+                android:textAppearance="?attr/textAppearanceBody2"
+                app:layout_constraintTop_toBottomOf="@id/httpsServerButton" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..1c57877
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,4 @@
+<resources>
+
+    <style name="Theme.HandyCam" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 645b5f6..f2c4d00 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">HandyCam</string>
+    <string name="start_server">Start Server</string>
+    <string name="stop_server">Stop Server</string>
+    <string name="start_https_server">Start HTTPS Server</string>
+    <string name="stop_https_server">Stop HTTPS Server</string>
+    <string name="server_running_on_port">Server running on port %1$d</string>
+    <string name="server_stopped">Server stopped</string>
+    <string name="camera_back">back</string>
+    <string name="camera_front">front</string>
+    <string name="server_running_on_port_with_access">Server running on port %1$d\nAccess at: https://%2$s:%3$d</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5052209..1c57877 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.HandyCam" parent="Theme.AppCompat.Light.NoActionBar" />
+    <style name="Theme.HandyCam" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
 </resources>
\ No newline at end of file