diff --git a/inventory-app/app/build.gradle b/inventory-app/app/build.gradle
index 22a3067f63df..0112ed41c62c 100644
--- a/inventory-app/app/build.gradle
+++ b/inventory-app/app/build.gradle
@@ -21,8 +21,13 @@ android {
         viewBinding true
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '1.8'
     }
 }
 
@@ -41,15 +46,23 @@ dependencies {
 
     implementation "com.squareup.okhttp3:okhttp:4.12.0"
     implementation "com.squareup.retrofit2:retrofit:2.11.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.11.0"
 
-    implementation "org.apache.poi:poi-ooxml-lite:5.2.5"
+    // Apache POI for Excel and Streaming Reader
+    implementation "org.apache.poi:poi:5.2.5"
+    implementation "org.apache.poi:poi-ooxml:5.2.5"
+    // Using excel-streaming-reader for memory efficiency (batch processing of large files)
+    implementation "com.github.pjfanning:excel-streaming-reader:4.2.1"
 
     implementation "com.journeyapps:zxing-android-embedded:4.3.0"
+    implementation "com.google.zxing:core:3.5.3"
 
     implementation "com.google.dagger:hilt-android:2.51"
     kapt "com.google.dagger:hilt-compiler:2.51"
 
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
     implementation "androidx.activity:activity-ktx:1.9.0"
     implementation "androidx.fragment:fragment-ktx:1.6.2"
 }
diff --git a/inventory-app/app/src/main/AndroidManifest.xml b/inventory-app/app/src/main/AndroidManifest.xml
index 6f95bf322585..2551ecfa416a 100644
--- a/inventory-app/app/src/main/AndroidManifest.xml
+++ b/inventory-app/app/src/main/AndroidManifest.xml
@@ -1,21 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.example.inventory">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
     <application
+        android:name=".InventoryApplication"
         android:allowBackup="true"
-        android:label="@string/app_name"
-        android:supportsRtl="true">
-        <activity
-            android:name="com.example.inventory.ui.settings.SettingsActivity"
-            android:exported="false" />
+        android:label="Inventory App"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+        tools:replace="android:theme">
+
         <activity
-            android:name="com.example.inventory.ui.MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".ui.settings.SettingsActivity"
+            android:exported="false"
+            android:parentActivityName=".ui.main.MainActivity"/>
+
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:replace="android:screenOrientation" />
+
     </application>
+
 </manifest>
diff --git a/inventory-app/app/src/main/java/com/example/inventory/InventoryApplication.kt b/inventory-app/app/src/main/java/com/example/inventory/InventoryApplication.kt
new file mode 100644
index 000000000000..b8ce83e2c7e3
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/InventoryApplication.kt
@@ -0,0 +1,7 @@
+package com.example.inventory
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class InventoryApplication : Application()
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/AppDatabase.kt b/inventory-app/app/src/main/java/com/example/inventory/data/AppDatabase.kt
index 2ca95d56ccf2..0a7f92d2526b 100644
--- a/inventory-app/app/src/main/java/com/example/inventory/data/AppDatabase.kt
+++ b/inventory-app/app/src/main/java/com/example/inventory/data/AppDatabase.kt
@@ -2,9 +2,11 @@ package com.example.inventory.data
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import com.example.inventory.data.dao.InventoryDao
+import com.example.inventory.data.entity.Item
+import com.example.inventory.data.entity.WarehouseStock
 
-@Database(entities = [Item::class, WarehouseStock::class], version = 1)
+@Database(entities = [Item::class, WarehouseStock::class], version = 1, exportSchema = false)
 abstract class AppDatabase : RoomDatabase() {
-    abstract fun itemDao(): ItemDao
-    abstract fun warehouseStockDao(): WarehouseStockDao
+    abstract fun inventoryDao(): InventoryDao
 }
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/Item.kt b/inventory-app/app/src/main/java/com/example/inventory/data/Item.kt
deleted file mode 100644
index 8244964546db..000000000000
--- a/inventory-app/app/src/main/java/com/example/inventory/data/Item.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.inventory.data
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "items", indices = [Index(value = ["code"], unique = true)])
-data class Item(
-    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    @ColumnInfo(name = "code") val code: String,
-    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "price") val price: Double
-)
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/ItemDao.kt b/inventory-app/app/src/main/java/com/example/inventory/data/ItemDao.kt
deleted file mode 100644
index 05ec3346c64f..000000000000
--- a/inventory-app/app/src/main/java/com/example/inventory/data/ItemDao.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.example.inventory.data
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-
-@Dao
-interface ItemDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertItems(items: List<Item>): List<Long>
-
-    @Query("SELECT * FROM items WHERE code = :code LIMIT 1")
-    suspend fun findByCode(code: String): Item?
-
-    @Transaction
-    @Query("SELECT * FROM items WHERE code = :code LIMIT 1")
-    suspend fun findWithStock(code: String): ItemWithStock?
-
-    @Query("DELETE FROM items")
-    suspend fun clearItems()
-}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/ItemWithStock.kt b/inventory-app/app/src/main/java/com/example/inventory/data/ItemWithStock.kt
deleted file mode 100644
index 488e62ee740b..000000000000
--- a/inventory-app/app/src/main/java/com/example/inventory/data/ItemWithStock.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.example.inventory.data
-
-import androidx.room.Embedded
-import androidx.room.Relation
-
-data class ItemWithStock(
-    @Embedded val item: Item,
-    @Relation(parentColumn = "id", entityColumn = "itemId")
-    val stock: List<WarehouseStock>
-)
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/WarehouseStockDao.kt b/inventory-app/app/src/main/java/com/example/inventory/data/WarehouseStockDao.kt
deleted file mode 100644
index aa9e3e9f1b8a..000000000000
--- a/inventory-app/app/src/main/java/com/example/inventory/data/WarehouseStockDao.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.inventory.data
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-
-@Dao
-interface WarehouseStockDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAll(stocks: List<WarehouseStock>)
-
-    @Query("DELETE FROM warehouse_stock")
-    suspend fun clearStock()
-}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/api/DownloadService.kt b/inventory-app/app/src/main/java/com/example/inventory/data/api/DownloadService.kt
new file mode 100644
index 000000000000..f13be3ff6cb8
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/data/api/DownloadService.kt
@@ -0,0 +1,13 @@
+package com.example.inventory.data.api
+
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Streaming
+import retrofit2.http.Url
+
+interface DownloadService {
+    @Streaming
+    @GET
+    suspend fun downloadFile(@Url url: String): Response<ResponseBody>
+}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/dao/InventoryDao.kt b/inventory-app/app/src/main/java/com/example/inventory/data/dao/InventoryDao.kt
new file mode 100644
index 000000000000..a35fa88eca52
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/data/dao/InventoryDao.kt
@@ -0,0 +1,42 @@
+package com.example.inventory.data.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import com.example.inventory.data.entity.Item
+import com.example.inventory.data.entity.WarehouseStock
+
+@Dao
+interface InventoryDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertItems(items: List<Item>): List<Long>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertStocks(stocks: List<WarehouseStock>)
+
+    @Query("SELECT * FROM items WHERE code = :code LIMIT 1")
+    suspend fun getItemByCode(code: String): Item?
+
+    @Query("SELECT * FROM warehouse_stocks WHERE itemId = :itemId AND quantity > 0")
+    suspend fun getStocksByItemId(itemId: Long): List<WarehouseStock>
+
+    @Query("DELETE FROM items")
+    suspend fun clearAllItems()
+
+    @Query("DELETE FROM warehouse_stocks")
+    suspend fun clearAllStocks()
+
+    @Transaction
+    suspend fun clearAndInsertBatch(items: List<Item>, stocks: Map<String, List<WarehouseStock>>) {
+        // This method is tricky because we need IDs for stocks.
+        // It's better to handle logic in Repository to insert items, get IDs, then insert stocks.
+        // But for batch processing, we might want to do it differently.
+        // Actually, if we use code as a reference in stock it might be easier but requirement says:
+        // "Item (id, code, name, price) and WarehouseStock (itemId, warehouseName, quantity)"
+
+        // So we will just provide basic insert methods and handle logic in repository/usecase.
+    }
+}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/entity/Item.kt b/inventory-app/app/src/main/java/com/example/inventory/data/entity/Item.kt
new file mode 100644
index 000000000000..0795f2b9876e
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/data/entity/Item.kt
@@ -0,0 +1,17 @@
+package com.example.inventory.data.entity
+
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@Entity(
+    tableName = "items",
+    indices = [Index(value = ["code"], unique = true)]
+)
+data class Item(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+    val code: String,
+    val name: String,
+    val price: Double
+)
diff --git a/inventory-app/app/src/main/java/com/example/inventory/data/WarehouseStock.kt b/inventory-app/app/src/main/java/com/example/inventory/data/entity/WarehouseStock.kt
similarity index 66%
rename from inventory-app/app/src/main/java/com/example/inventory/data/WarehouseStock.kt
rename to inventory-app/app/src/main/java/com/example/inventory/data/entity/WarehouseStock.kt
index 92675ba8a977..7222938fba53 100644
--- a/inventory-app/app/src/main/java/com/example/inventory/data/WarehouseStock.kt
+++ b/inventory-app/app/src/main/java/com/example/inventory/data/entity/WarehouseStock.kt
@@ -1,12 +1,12 @@
-package com.example.inventory.data
+package com.example.inventory.data.entity
 
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
+import androidx.room.PrimaryKey
 
 @Entity(
-    tableName = "warehouse_stock",
-    primaryKeys = ["itemId", "warehouseName"],
+    tableName = "warehouse_stocks",
     foreignKeys = [
         ForeignKey(
             entity = Item::class,
@@ -15,9 +15,11 @@ import androidx.room.Index
             onDelete = ForeignKey.CASCADE
         )
     ],
-    indices = [Index("itemId"), Index("warehouseName")]
+    indices = [Index(value = ["itemId"])]
 )
 data class WarehouseStock(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
     val itemId: Long,
     val warehouseName: String,
     val quantity: Int
diff --git a/inventory-app/app/src/main/java/com/example/inventory/di/DatabaseModule.kt b/inventory-app/app/src/main/java/com/example/inventory/di/DatabaseModule.kt
new file mode 100644
index 000000000000..dfab6a2a1dee
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/di/DatabaseModule.kt
@@ -0,0 +1,32 @@
+package com.example.inventory.di
+
+import android.content.Context
+import androidx.room.Room
+import com.example.inventory.data.AppDatabase
+import com.example.inventory.data.dao.InventoryDao
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DatabaseModule {
+
+    @Provides
+    @Singleton
+    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+        return Room.databaseBuilder(
+            context,
+            AppDatabase::class.java,
+            "inventory_db"
+        ).fallbackToDestructiveMigration().build()
+    }
+
+    @Provides
+    fun provideInventoryDao(database: AppDatabase): InventoryDao {
+        return database.inventoryDao()
+    }
+}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/repository/InventoryRepository.kt b/inventory-app/app/src/main/java/com/example/inventory/repository/InventoryRepository.kt
index 44c540fc6d1d..7a546197b07f 100644
--- a/inventory-app/app/src/main/java/com/example/inventory/repository/InventoryRepository.kt
+++ b/inventory-app/app/src/main/java/com/example/inventory/repository/InventoryRepository.kt
@@ -1,118 +1,90 @@
 package com.example.inventory.repository
 
-import com.example.inventory.data.AppDatabase
-import com.example.inventory.data.Item
-import com.example.inventory.data.ItemWithStock
-import com.example.inventory.data.WarehouseStock
-import kotlinx.coroutines.CoroutineDispatcher
+import com.example.inventory.data.api.DownloadService
+import com.example.inventory.data.dao.InventoryDao
+import com.example.inventory.data.entity.Item
+import com.example.inventory.data.entity.WarehouseStock
+import com.example.inventory.util.ExcelParser
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.withContext
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.apache.poi.ss.usermodel.WorkbookFactory
-import java.io.File
-import java.io.FileInputStream
-
-data class PendingStock(
-    val itemIndex: Int,
-    val warehouseName: String,
-    val quantity: Int
-)
-
-class InventoryRepository(
-    private val db: AppDatabase,
-    private val okHttpClient: OkHttpClient,
-    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import okhttp3.ResponseBody
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.io.InputStream
+import javax.inject.Inject
+
+class InventoryRepository @Inject constructor(
+    private val inventoryDao: InventoryDao
 ) {
-
-    private val _importProgress = MutableStateFlow(0)
-    val importProgress: StateFlow<Int> = _importProgress.asStateFlow()
-
-    suspend fun downloadAndImport(url: String) = withContext(ioDispatcher) {
-        val tempFile = File.createTempFile("inventory", ".xlsx")
-        okHttpClient.newCall(Request.Builder().url(url).build()).execute().use { resp ->
-            resp.body?.byteStream()?.use { input ->
-                tempFile.outputStream().use { output -> input.copyTo(output) }
-            }
+    // Ideally, injected via Hilt
+    private val retrofit = Retrofit.Builder()
+        .baseUrl("https://google.com/") // Placeholder, URL will be dynamic
+        .addConverterFactory(GsonConverterFactory.create())
+        .build()
+
+    private val downloadService = retrofit.create(DownloadService::class.java)
+    private val parser = ExcelParser()
+
+    fun getItemByCode(code: String): Flow<Item?> = flow {
+        emit(inventoryDao.getItemByCode(code))
+    }.flowOn(Dispatchers.IO)
+
+    fun getStocksByItemId(itemId: Long): Flow<List<WarehouseStock>> = flow {
+        emit(inventoryDao.getStocksByItemId(itemId))
+    }.flowOn(Dispatchers.IO)
+
+    suspend fun downloadAndProcessExcel(url: String, onProgress: (String) -> Unit) {
+        // 1. Download
+        onProgress("Downloading...")
+        // For dynamic URL with retrofit, we can just pass the full URL to the @Url parameter
+        // The base URL doesn't matter much if we use @Url
+        val response = downloadService.downloadFile(url)
+        val body = response.body()
+
+        if (!response.isSuccessful || body == null) {
+            throw Exception("Download failed: ${response.code()}")
         }
-        importExcel(tempFile)
-    }
-
-    private suspend fun importExcel(file: File) = withContext(ioDispatcher) {
-        db.withTransaction {
-            db.itemDao().clearItems()
-            db.warehouseStockDao().clearStock()
-        }
-
-        FileInputStream(file).use { fis ->
-            val workbook = WorkbookFactory.create(fis)
-            val sheet = workbook.getSheetAt(0)
-            val totalRows = sheet.lastRowNum
-            if (totalRows == 0) return@use
-
-            val headerRow = sheet.getRow(0)
-            val headers = headerRow.map { it.stringCellValue.trim() }
-            val warehouseCols = headers.drop(3)
-
-            val batchItems = mutableListOf<Item>()
-            val pendingStocks = mutableListOf<PendingStock>()
-            var processed = 0
 
-            for (rowIndex in 1..totalRows) {
-                val row = sheet.getRow(rowIndex) ?: continue
-                val code = row.getCell(0)?.stringCellValue.orEmpty()
-                val name = row.getCell(1)?.stringCellValue.orEmpty()
-                val price = row.getCell(2)?.numericCellValue ?: 0.0
-
-                val itemIndex = batchItems.size
-                batchItems.add(Item(code = code, name = name, price = price))
-
-                warehouseCols.forEachIndexed { idx, warehouseName ->
-                    val qty = row.getCell(3 + idx)?.numericCellValue?.toInt() ?: 0
-                    if (qty > 0) {
-                        pendingStocks.add(PendingStock(itemIndex, warehouseName, qty))
-                    }
-                }
-
-                if (batchItems.size >= 500) {
-                    persistBatch(batchItems, pendingStocks)
-                    processed += batchItems.size
-                    batchItems.clear()
-                    pendingStocks.clear()
-                    _importProgress.value = ((processed / totalRows.toFloat()) * 100).toInt().coerceAtMost(99)
+        // 2. Parse and Insert
+        onProgress("Processing...")
+        val inputStream: InputStream = body.byteStream()
+
+        // Clear old data? Requirement implies inventory update.
+        // Strategy: Clear all before load or Update?
+        // Usually full replace for "Import".
+        inventoryDao.clearAllStocks()
+        inventoryDao.clearAllItems()
+
+        var count = 0
+        parser.parseSuspending(inputStream) { batch ->
+            // Batch is List<ParsedData>
+            val items = batch.map { it.item }
+
+            // Insert Items
+            val insertedIds = inventoryDao.insertItems(items)
+
+            // Prepare Stocks with correct ItemIDs
+            val stocks = mutableListOf<WarehouseStock>()
+            batch.forEachIndexed { index, parsedData ->
+                val itemId = insertedIds[index] // Assuming ordered return match ordered insert
+                parsedData.stocks.forEach { dummy ->
+                    stocks.add(WarehouseStock(
+                        itemId = itemId,
+                        warehouseName = dummy.warehouseName,
+                        quantity = dummy.quantity
+                    ))
                 }
             }
 
-            if (batchItems.isNotEmpty()) {
-                persistBatch(batchItems, pendingStocks)
-                processed += batchItems.size
-            }
-            _importProgress.value = 100
-            workbook.close()
-        }
-    }
+            // Insert Stocks
+            inventoryDao.insertStocks(stocks)
 
-    private suspend fun persistBatch(
-        items: List<Item>,
-        pendingStocks: List<PendingStock>
-    ) {
-        db.withTransaction {
-            val ids = db.itemDao().insertItems(items)
-            val idMap = ids.withIndex().associate { (index, id) -> index to id }
-            val stocks = pendingStocks.mapNotNull { pending ->
-                val itemId = idMap[pending.itemIndex] ?: return@mapNotNull null
-                WarehouseStock(itemId = itemId, warehouseName = pending.warehouseName, quantity = pending.quantity)
-            }
-            if (stocks.isNotEmpty()) {
-                db.warehouseStockDao().insertAll(stocks)
-            }
+            count += batch.size
+            onProgress("Processed $count records...")
         }
-    }
 
-    suspend fun searchByCode(code: String): ItemWithStock? = withContext(ioDispatcher) {
-        db.itemDao().findWithStock(code.trim())
+        onProgress("Completed! Total: $count")
     }
 }
diff --git a/inventory-app/app/src/main/java/com/example/inventory/ui/InventoryViewModel.kt b/inventory-app/app/src/main/java/com/example/inventory/ui/InventoryViewModel.kt
deleted file mode 100644
index a8fa3033c0f5..000000000000
--- a/inventory-app/app/src/main/java/com/example/inventory/ui/InventoryViewModel.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.example.inventory.ui
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.inventory.data.ItemWithStock
-import com.example.inventory.repository.InventoryRepository
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-
-class InventoryViewModel(
-    private val repository: InventoryRepository,
-    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
-) : ViewModel() {
-
-    val importProgress: StateFlow<Int> = repository.importProgress
-
-    private val _searchResult = MutableStateFlow<ItemWithStock?>(null)
-    val searchResult: StateFlow<ItemWithStock?> = _searchResult.asStateFlow()
-
-    fun import(url: String) {
-        viewModelScope.launch {
-            repository.downloadAndImport(url)
-        }
-    }
-
-    fun search(code: String) {
-        viewModelScope.launch(ioDispatcher) {
-            _searchResult.value = repository.searchByCode(code)
-        }
-    }
-}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/ui/MainActivity.kt b/inventory-app/app/src/main/java/com/example/inventory/ui/MainActivity.kt
deleted file mode 100644
index 82dd48560e6d..000000000000
--- a/inventory-app/app/src/main/java/com/example/inventory/ui/MainActivity.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.example.inventory.ui
-
-import android.os.Bundle
-import android.view.View
-import android.widget.Button
-import android.widget.EditText
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.activity.ComponentActivity
-import androidx.activity.viewModels
-import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.ViewModelProvider
-import androidx.room.Room
-import com.example.inventory.R
-import com.example.inventory.data.AppDatabase
-import com.example.inventory.data.WarehouseStock
-import com.example.inventory.repository.InventoryRepository
-import com.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanOptions
-import kotlinx.coroutines.launch
-import okhttp3.OkHttpClient
-
-class MainActivity : ComponentActivity() {
-
-    private val viewModel: InventoryViewModel by viewModels {
-        object : ViewModelProvider.Factory {
-            override fun <T : androidx.lifecycle.ViewModel> create(modelClass: Class<T>): T {
-                val db = Room.databaseBuilder(
-                    applicationContext,
-                    AppDatabase::class.java,
-                    "inventory-db"
-                ).fallbackToDestructiveMigration().build()
-                val repo = InventoryRepository(db, OkHttpClient())
-                @Suppress("UNCHECKED_CAST")
-                return InventoryViewModel(repo) as T
-            }
-        }
-    }
-
-    private lateinit var etCode: EditText
-    private lateinit var tvResult: TextView
-    private lateinit var btnShowStock: Button
-    private lateinit var progressBar: ProgressBar
-
-    private val barcodeLauncher = registerForActivityResult(ScanContract()) { result ->
-        result.contents?.let {
-            etCode.setText(it)
-            viewModel.search(it)
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-        etCode = findViewById(R.id.etCode)
-        tvResult = findViewById(R.id.tvResult)
-        btnShowStock = findViewById(R.id.btnShowStock)
-        progressBar = findViewById(R.id.progressImport)
-
-        findViewById<Button>(R.id.btnScan).setOnClickListener {
-            barcodeLauncher.launch(ScanOptions().setDesiredBarcodeFormats(ScanOptions.ALL_CODE_TYPES))
-        }
-
-        findViewById<Button>(R.id.btnSearch).setOnClickListener {
-            viewModel.search(etCode.text.toString())
-        }
-
-        lifecycleScope.launch {
-            viewModel.searchResult.collect { result ->
-                if (result == null) {
-                    tvResult.text = getString(R.string.result_empty)
-                    btnShowStock.visibility = View.GONE
-                } else {
-                    tvResult.text = getString(R.string.result_template, result.item.name, result.item.code, result.item.price)
-                    btnShowStock.visibility = View.VISIBLE
-                    btnShowStock.setOnClickListener { showStockDialog(result.stock) }
-                }
-            }
-        }
-
-        lifecycleScope.launch {
-            viewModel.importProgress.collect { progress ->
-                if (progress in 1..99) {
-                    progressBar.visibility = View.VISIBLE
-                    progressBar.progress = progress
-                } else {
-                    progressBar.visibility = View.GONE
-                }
-            }
-        }
-    }
-
-    private fun showStockDialog(stocks: List<WarehouseStock>) {
-        val items = stocks
-            .filter { it.quantity > 0 }
-            .joinToString("\n") { "${it.warehouseName}: ${it.quantity}" }
-            .ifEmpty { getString(R.string.no_stock) }
-
-        AlertDialog.Builder(this)
-            .setTitle(R.string.warehouse_quantities)
-            .setMessage(items)
-            .setPositiveButton(android.R.string.ok, null)
-            .show()
-    }
-}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/ui/main/MainActivity.kt b/inventory-app/app/src/main/java/com/example/inventory/ui/main/MainActivity.kt
new file mode 100644
index 000000000000..76a57b2babd1
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/ui/main/MainActivity.kt
@@ -0,0 +1,109 @@
+package com.example.inventory.ui.main
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import com.example.inventory.R
+import com.example.inventory.databinding.ActivityMainBinding
+import com.example.inventory.ui.settings.SettingsActivity
+import com.google.zxing.integration.android.IntentIntegrator
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityMainBinding
+    private val viewModel: MainViewModel by viewModels()
+    private var currentItemId: Long = -1
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.btnSearch.setOnClickListener {
+            val code = binding.etSearch.text.toString()
+            if (code.isNotEmpty()) {
+                viewModel.searchItem(code)
+            }
+        }
+
+        binding.btnScan.setOnClickListener {
+            val integrator = IntentIntegrator(this)
+            integrator.setDesiredBarcodeFormats(IntentIntegrator.ALL_CODE_TYPES)
+            integrator.setPrompt("Scan Item Barcode")
+            integrator.setCameraId(0)
+            integrator.setBeepEnabled(true)
+            integrator.setBarcodeImageEnabled(false)
+            integrator.initiateScan()
+        }
+
+        binding.btnShowStocks.setOnClickListener {
+            if (currentItemId != -1L) {
+                viewModel.loadStocks(currentItemId)
+            }
+        }
+
+        viewModel.searchResult.observe(this) { item ->
+            if (item != null) {
+                binding.cardResult.visibility = View.VISIBLE
+                binding.tvNoResult.visibility = View.GONE
+                binding.tvCode.text = "Code: ${item.code}"
+                binding.tvName.text = "Name: ${item.name}"
+                binding.tvPrice.text = "Price: ${item.price}"
+                currentItemId = item.id
+            } else {
+                binding.cardResult.visibility = View.GONE
+                binding.tvNoResult.visibility = View.VISIBLE
+                currentItemId = -1
+            }
+        }
+
+        viewModel.stocks.observe(this) { stocks ->
+            if (stocks.isNotEmpty()) {
+                val dialog = WarehouseDialogFragment(stocks)
+                dialog.show(supportFragmentManager, "WarehouseDialog")
+            } else {
+                Toast.makeText(this, "No stock information available", Toast.LENGTH_SHORT).show()
+            }
+        }
+
+        viewModel.error.observe(this) { msg ->
+            if (msg != null) {
+                Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        val result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data)
+        if (result != null) {
+            if (result.contents == null) {
+                Toast.makeText(this, "Cancelled", Toast.LENGTH_LONG).show()
+            } else {
+                binding.etSearch.setText(result.contents)
+                viewModel.searchItem(result.contents)
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menu?.add(0, 1, 0, "Settings")
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == 1) {
+            startActivity(Intent(this, SettingsActivity::class.java))
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/ui/main/MainViewModel.kt b/inventory-app/app/src/main/java/com/example/inventory/ui/main/MainViewModel.kt
new file mode 100644
index 000000000000..e88aae5dca1b
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/ui/main/MainViewModel.kt
@@ -0,0 +1,76 @@
+package com.example.inventory.ui.main
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.inventory.data.entity.Item
+import com.example.inventory.data.entity.WarehouseStock
+import com.example.inventory.repository.InventoryRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class MainViewModel @Inject constructor(
+    private val repository: InventoryRepository
+) : ViewModel() {
+
+    private val _searchResult = MutableLiveData<Item?>()
+    val searchResult: LiveData<Item?> = _searchResult
+
+    private val _stocks = MutableLiveData<List<WarehouseStock>>()
+    val stocks: LiveData<List<WarehouseStock>> = _stocks
+
+    private val _importStatus = MutableLiveData<String>()
+    val importStatus: LiveData<String> = _importStatus
+
+    private val _isLoading = MutableLiveData<Boolean>()
+    val isLoading: LiveData<Boolean> = _isLoading
+
+    private val _error = MutableLiveData<String?>()
+    val error: LiveData<String?> = _error
+
+    fun searchItem(code: String) {
+        viewModelScope.launch {
+            repository.getItemByCode(code).collect { item ->
+                _searchResult.value = item
+                if (item == null) {
+                    _error.value = "Item not found"
+                } else {
+                    _error.value = null
+                }
+            }
+        }
+    }
+
+    fun loadStocks(itemId: Long) {
+        viewModelScope.launch {
+            repository.getStocksByItemId(itemId).collect { list ->
+                _stocks.value = list
+            }
+        }
+    }
+
+    fun importData(url: String) {
+        if (url.isBlank()) {
+            _error.value = "URL is empty"
+            return
+        }
+        _isLoading.value = true
+        _importStatus.value = "Starting..."
+        viewModelScope.launch {
+            try {
+                repository.downloadAndProcessExcel(url) { status ->
+                    _importStatus.postValue(status)
+                }
+                _importStatus.value = "Done"
+            } catch (e: Exception) {
+                _error.value = "Error: ${e.message}"
+                _importStatus.value = "Failed"
+            } finally {
+                _isLoading.value = false
+            }
+        }
+    }
+}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/ui/main/WarehouseDialogFragment.kt b/inventory-app/app/src/main/java/com/example/inventory/ui/main/WarehouseDialogFragment.kt
new file mode 100644
index 000000000000..ce014eaa3841
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/ui/main/WarehouseDialogFragment.kt
@@ -0,0 +1,24 @@
+package com.example.inventory.ui.main
+
+import android.app.Dialog
+import android.os.Bundle
+import android.widget.ArrayAdapter
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.example.inventory.data.entity.WarehouseStock
+
+class WarehouseDialogFragment(private val stocks: List<WarehouseStock>) : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = AlertDialog.Builder(requireContext())
+        builder.setTitle("Warehouse Stock")
+
+        val stockList = stocks.map { "${it.warehouseName}: ${it.quantity}" }
+        val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, stockList)
+
+        builder.setAdapter(adapter, null)
+        builder.setPositiveButton("Close") { dialog, _ -> dialog.dismiss() }
+
+        return builder.create()
+    }
+}
diff --git a/inventory-app/app/src/main/java/com/example/inventory/ui/settings/SettingsActivity.kt b/inventory-app/app/src/main/java/com/example/inventory/ui/settings/SettingsActivity.kt
index 953f2ef25e0f..1cceec6d5f38 100644
--- a/inventory-app/app/src/main/java/com/example/inventory/ui/settings/SettingsActivity.kt
+++ b/inventory-app/app/src/main/java/com/example/inventory/ui/settings/SettingsActivity.kt
@@ -1,28 +1,51 @@
 package com.example.inventory.ui.settings
 
+import android.content.Context
+import android.content.SharedPreferences
 import android.os.Bundle
-import android.widget.Button
-import android.widget.EditText
+import android.view.View
 import android.widget.Toast
-import androidx.activity.ComponentActivity
-import com.example.inventory.R
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import com.example.inventory.databinding.ActivitySettingsBinding
+import com.example.inventory.ui.main.MainViewModel
+import dagger.hilt.android.AndroidEntryPoint
 
-class SettingsActivity : ComponentActivity() {
+@AndroidEntryPoint
+class SettingsActivity : AppCompatActivity() {
 
-    private val prefs by lazy { getSharedPreferences("inventory-settings", MODE_PRIVATE) }
+    private lateinit var binding: ActivitySettingsBinding
+    private val viewModel: MainViewModel by viewModels()
+    private lateinit var prefs: SharedPreferences
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_settings)
+        binding = ActivitySettingsBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
-        val etUrl = findViewById<EditText>(R.id.etUrl)
-        val btnSave = findViewById<Button>(R.id.btnSave)
+        prefs = getSharedPreferences("app_prefs", Context.MODE_PRIVATE)
 
-        etUrl.setText(prefs.getString("excel_url", ""))
+        val savedUrl = prefs.getString("download_url", "https://example.com/data.xlsx")
+        binding.etUrl.setText(savedUrl)
 
-        btnSave.setOnClickListener {
-            prefs.edit().putString("excel_url", etUrl.text.toString()).apply()
-            Toast.makeText(this, R.string.saved, Toast.LENGTH_SHORT).show()
+        binding.btnSave.setOnClickListener {
+            val url = binding.etUrl.text.toString()
+            prefs.edit().putString("download_url", url).apply()
+            Toast.makeText(this, "URL Saved", Toast.LENGTH_SHORT).show()
+        }
+
+        binding.btnImportNow.setOnClickListener {
+             val url = binding.etUrl.text.toString()
+             viewModel.importData(url)
+        }
+
+        viewModel.importStatus.observe(this) { status ->
+            binding.tvStatus.text = status
+        }
+
+        viewModel.isLoading.observe(this) { isLoading ->
+            binding.progressBar.visibility = if (isLoading) View.VISIBLE else View.GONE
+            binding.btnImportNow.isEnabled = !isLoading
         }
     }
 }
diff --git a/inventory-app/app/src/main/java/com/example/inventory/util/ExcelParser.kt b/inventory-app/app/src/main/java/com/example/inventory/util/ExcelParser.kt
new file mode 100644
index 000000000000..2e69906e20f4
--- /dev/null
+++ b/inventory-app/app/src/main/java/com/example/inventory/util/ExcelParser.kt
@@ -0,0 +1,129 @@
+package com.example.inventory.util
+
+import com.example.inventory.data.entity.Item
+import com.example.inventory.data.entity.WarehouseStock
+import com.github.pjfanning.xlsx.StreamingReader
+import org.apache.poi.ss.usermodel.Cell
+import org.apache.poi.ss.usermodel.CellType
+import org.apache.poi.ss.usermodel.DateUtil
+import java.io.InputStream
+
+data class ParsedData(
+    val item: Item,
+    val stocks: List<WarehouseStockDummy>
+)
+
+data class WarehouseStockDummy(
+    val warehouseName: String,
+    val quantity: Int
+)
+
+class ExcelParser {
+
+    /**
+     * Parses the Excel file stream using StreamingReader for memory efficiency.
+     * This ensures that 50k rows are processed without loading the whole DOM into memory.
+     */
+    suspend fun parseSuspending(inputStream: InputStream, onBatchReady: suspend (List<ParsedData>) -> Unit) {
+         // Use StreamingReader to handle large files.
+         // bufferSize: amount of memory to use for buffering input stream
+         // rowCacheSize: number of rows to keep in memory (defaults to 10)
+         val workbook = StreamingReader.builder()
+             .rowCacheSize(100)
+             .bufferSize(4096)
+             .open(inputStream)
+
+         val sheet = workbook.getSheetAt(0)
+
+         var codeIdx = -1
+         var nameIdx = -1
+         var priceIdx = -1
+         val warehouseIndices = mutableMapOf<Int, String>()
+
+         var isHeader = true
+
+         val batchSize = 500
+         val currentBatch = mutableListOf<ParsedData>()
+
+         for (row in sheet) {
+             if (isHeader) {
+                 for (cell in row) {
+                     val text = cell.stringCellValue
+                     when {
+                         text.equals("ItemCode", ignoreCase = true) -> codeIdx = cell.columnIndex
+                         text.equals("ItemName", ignoreCase = true) -> nameIdx = cell.columnIndex
+                         text.equals("Price", ignoreCase = true) -> priceIdx = cell.columnIndex
+                         // Assuming warehouse columns might be "Warehouse1_Qty" or just "Warehouse 1"
+                         // We'll treat any other column starting with "Warehouse" or "Wh" as a warehouse if needed,
+                         // or just capture everything else? The prompt says "Warehouse1_Qty, Warehouse2_Qty, ...".
+                         text.contains("Warehouse", ignoreCase = true) || text.contains("_Qty", ignoreCase = true) -> {
+                             warehouseIndices[cell.columnIndex] = text
+                         }
+                     }
+                 }
+                 isHeader = false
+                 continue
+             }
+
+             // Process Data Row
+             // StreamingReader cells might return null if empty, or specific types
+
+             // Get Code
+             if (codeIdx == -1) continue // Should not happen if header matches
+
+             val codeCell = row.getCell(codeIdx)
+             val code = getCellValueAsString(codeCell)
+             if (code.isBlank()) continue
+
+             val name = if (nameIdx != -1) getCellValueAsString(row.getCell(nameIdx)) else ""
+
+             // Price handling
+             val priceStr = if (priceIdx != -1) getCellValueAsString(row.getCell(priceIdx)) else "0"
+             val price = priceStr.toDoubleOrNull() ?: 0.0
+
+             val stocks = mutableListOf<WarehouseStockDummy>()
+             for ((idx, whName) in warehouseIndices) {
+                 val qtyCell = row.getCell(idx)
+                 val qtyStr = getCellValueAsString(qtyCell)
+                 // Clean string if needed
+                 val qty = qtyStr.toDoubleOrNull()?.toInt() ?: 0
+
+                 if (qty > 0) {
+                     stocks.add(WarehouseStockDummy(whName, qty))
+                 }
+             }
+
+             currentBatch.add(ParsedData(Item(code = code, name = name, price = price), stocks))
+
+             if (currentBatch.size >= batchSize) {
+                 onBatchReady(currentBatch.toList())
+                 currentBatch.clear()
+             }
+         }
+
+         if (currentBatch.isNotEmpty()) {
+             onBatchReady(currentBatch.toList())
+         }
+         workbook.close()
+    }
+
+    private fun getCellValueAsString(cell: Cell?): String {
+        if (cell == null) return ""
+        // StreamingReader specific behavior:
+        // It tries to return the value as it looks in the cell.
+        return when (cell.cellType) {
+            CellType.STRING -> cell.stringCellValue
+            CellType.NUMERIC -> {
+                if (DateUtil.isCellDateFormatted(cell)) {
+                    cell.dateCellValue.toString()
+                } else {
+                     val d = cell.numericCellValue
+                     // If it is integer, remove decimal
+                     if (d == d.toLong().toDouble()) d.toLong().toString() else d.toString()
+                }
+            }
+            CellType.BOOLEAN -> cell.booleanCellValue.toString()
+            else -> cell.stringCellValue // StreamingReader often returns string for others
+        }
+    }
+}
diff --git a/inventory-app/app/src/main/res/layout/activity_main.xml b/inventory-app/app/src/main/res/layout/activity_main.xml
index 8a6e7c27b175..8a4cc2235bdc 100644
--- a/inventory-app/app/src/main/res/layout/activity_main.xml
+++ b/inventory-app/app/src/main/res/layout/activity_main.xml
@@ -5,53 +5,84 @@
     android:orientation="vertical"
     android:padding="16dp">
 
-    <EditText
-        android:id="@+id/etCode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="Item Code"
-        android:inputType="text" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/btnScan"
+        <EditText
+            android:id="@+id/etSearch"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Scan Barcode" />
+            android:hint="Enter Item Code"
+            android:inputType="text" />
 
         <Button
-            android:id="@+id/btnSearch"
-            android:layout_width="0dp"
+            android:id="@+id/btnScan"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="Search" />
+            android:text="Scan" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/tvResult"
+    <Button
+        android:id="@+id/btnSearch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="12dp"
-        android:text="Result" />
+        android:text="Search" />
 
-    <Button
-        android:id="@+id/btnShowStock"
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cardResult"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Show Warehouse Quantities"
-        android:visibility="gone" />
+        android:layout_marginTop="16dp"
+        android:visibility="gone">
 
-    <ProgressBar
-        android:id="@+id/progressImport"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:id="@+id/tvCode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Code: "
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tvName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="Name: "
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/tvPrice"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="Price: "
+                android:textColor="@android:color/holo_green_dark" />
+
+            <Button
+                android:id="@+id/btnShowStocks"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="Show Warehouse Quantities" />
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+    <TextView
+        android:id="@+id/tvNoResult"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:max="100"
-        android:visibility="gone" />
+        android:layout_marginTop="20dp"
+        android:text="No item found"
+        android:visibility="gone"
+        android:layout_gravity="center_horizontal"/>
 
 </LinearLayout>
diff --git a/inventory-app/app/src/main/res/layout/activity_settings.xml b/inventory-app/app/src/main/res/layout/activity_settings.xml
index 3698b8eaf1d6..58b7d96d90b9 100644
--- a/inventory-app/app/src/main/res/layout/activity_settings.xml
+++ b/inventory-app/app/src/main/res/layout/activity_settings.xml
@@ -9,13 +9,34 @@
         android:id="@+id/etUrl"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/import_url_hint"
+        android:hint="Enter Excel Direct Download URL"
         android:inputType="textUri" />
 
     <Button
         android:id="@+id/btnSave"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Save URL" />
+
+    <Button
+        android:id="@+id/btnImportNow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Import Data Now" />
+
+    <TextView
+        android:id="@+id/tvStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Status: Idle" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/save" />
+        android:layout_gravity="center"
+        android:visibility="gone" />
 
 </LinearLayout>