diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/cache/DataPrefetchManager.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/cache/DataPrefetchManager.kt
index 8537b74..21103de 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/cache/DataPrefetchManager.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/cache/DataPrefetchManager.kt
@@ -154,8 +154,8 @@ class DataPrefetchManager {
                 search = null
             )
             if (result is ApiResult.Success) {
-                DataCache.updateDocuments(result.data.results)
-                println("DataPrefetchManager: Cached ${result.data.results.size} documents")
+                DataCache.updateDocuments(result.data)
+                println("DataPrefetchManager: Cached ${result.data.size} documents")
             }
         } catch (e: Exception) {
             println("DataPrefetchManager: Error fetching documents: ${e.message}")
@@ -173,9 +173,9 @@ class DataPrefetchManager {
                 search = null
             )
             if (result is ApiResult.Success) {
-                // ContractorListResponse.results is List<ContractorSummary>, not List<Contractor>
+                // API returns List<ContractorSummary>, not List<Contractor>
                 // Skip caching for now - full Contractor objects will be cached when fetched individually
-                println("DataPrefetchManager: Fetched ${result.data.results.size} contractor summaries")
+                println("DataPrefetchManager: Fetched ${result.data.size} contractor summaries")
             }
         } catch (e: Exception) {
             println("DataPrefetchManager: Error fetching contractors: ${e.message}")
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Contractor.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Contractor.kt
index b057b4c..c4e2595 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Contractor.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Contractor.kt
@@ -79,10 +79,5 @@ data class ContractorSummary(
     @SerialName("task_count") val taskCount: Int = 0
 )
 
-@Serializable
-data class ContractorListResponse(
-    val count: Int,
-    val next: String? = null,
-    val previous: String? = null,
-    val results: List<ContractorSummary>
-)
+// Removed: ContractorListResponse - no longer using paginated responses
+// API now returns List<ContractorSummary> directly
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt
index 9633e82..f615485 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/models/Document.kt
@@ -107,13 +107,8 @@ data class DocumentUpdateRequest(
     @SerialName("is_active") val isActive: Boolean? = null
 )
 
-@Serializable
-data class DocumentListResponse(
-    val count: Int,
-    val next: String? = null,
-    val previous: String? = null,
-    val results: List<Document>
-)
+// Removed: DocumentListResponse - no longer using paginated responses
+// API now returns List<Document> directly
 
 // Document type choices
 enum class DocumentType(val value: String, val displayName: String) {
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/APILayer.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/APILayer.kt
index 1d97fc8..b499e4b 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/APILayer.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/APILayer.kt
@@ -513,7 +513,7 @@ object APILayer {
         tags: String? = null,
         search: String? = null,
         forceRefresh: Boolean = false
-    ): ApiResult<DocumentListResponse> {
+    ): ApiResult<List<Document>> {
         val hasFilters = residenceId != null || documentType != null || category != null ||
                         contractorId != null || isActive != null || expiringSoon != null ||
                         tags != null || search != null
@@ -522,10 +522,7 @@ object APILayer {
         if (!forceRefresh && !hasFilters) {
             val cached = DataCache.documents.value
             if (cached.isNotEmpty()) {
-                return ApiResult.Success(DocumentListResponse(
-                    count = cached.size,
-                    results = cached
-                ))
+                return ApiResult.Success(cached)
             }
         }
 
@@ -538,7 +535,7 @@ object APILayer {
 
         // Update cache on success if no filters
         if (result is ApiResult.Success && !hasFilters) {
-            DataCache.updateDocuments(result.data.results)
+            DataCache.updateDocuments(result.data)
         }
 
         return result
@@ -688,10 +685,10 @@ object APILayer {
         isActive: Boolean? = null,
         search: String? = null,
         forceRefresh: Boolean = false
-    ): ApiResult<ContractorListResponse> {
+    ): ApiResult<List<ContractorSummary>> {
         val hasFilters = specialty != null || isFavorite != null || isActive != null || search != null
 
-        // Note: Cannot use cache here because ContractorListResponse expects List<ContractorSummary>
+        // Note: Cannot use cache here because API returns List<ContractorSummary>
         // but DataCache stores List<Contractor>. Cache is only used for individual contractor lookups.
 
         // Fetch from API
@@ -700,7 +697,7 @@ object APILayer {
 
         // Update cache on success if no filters
         if (result is ApiResult.Success && !hasFilters) {
-            // ContractorListResponse.results is List<ContractorSummary>, but we need List<Contractor>
+            // API returns List<ContractorSummary>, but we need List<Contractor> for cache
             // For now, we'll skip caching from this endpoint since it returns summaries
             // Cache will be populated from getContractor() or create/update operations
         }
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ContractorApi.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ContractorApi.kt
index 0b744bb..d291769 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ContractorApi.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ContractorApi.kt
@@ -15,7 +15,7 @@ class ContractorApi(private val client: HttpClient = ApiClient.httpClient) {
         isFavorite: Boolean? = null,
         isActive: Boolean? = null,
         search: String? = null
-    ): ApiResult<ContractorListResponse> {
+    ): ApiResult<List<ContractorSummary>> {
         return try {
             val response = client.get("$baseUrl/contractors/") {
                 header("Authorization", "Token $token")
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt
index 62fdca4..c241f44 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/DocumentApi.kt
@@ -21,7 +21,7 @@ class DocumentApi(private val client: HttpClient = ApiClient.httpClient) {
         expiringSoon: Int? = null,
         tags: String? = null,
         search: String? = null
-    ): ApiResult<DocumentListResponse> {
+    ): ApiResult<List<Document>> {
         return try {
             val response = client.get("$baseUrl/documents/") {
                 header("Authorization", "Token $token")
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/LookupsApi.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/LookupsApi.kt
index 994d1eb..395ebd6 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/LookupsApi.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/LookupsApi.kt
@@ -112,8 +112,7 @@ class LookupsApi(private val client: HttpClient = ApiClient.httpClient) {
             }
 
             if (response.status.isSuccess()) {
-                val data: PaginatedResponse<CustomTask> = response.body()
-                ApiResult.Success(data.results)
+                ApiResult.Success(response.body())
             } else {
                 ApiResult.Error("Failed to fetch tasks", response.status.value)
             }
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ResidenceApi.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ResidenceApi.kt
index 302daab..f5724f9 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ResidenceApi.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/ResidenceApi.kt
@@ -16,8 +16,7 @@ class ResidenceApi(private val client: HttpClient = ApiClient.httpClient) {
             }
 
             if (response.status.isSuccess()) {
-                val data: PaginatedResponse<Residence> = response.body()
-                ApiResult.Success(data.results)
+                ApiResult.Success(response.body())
             } else {
                 ApiResult.Error("Failed to fetch residences", response.status.value)
             }
@@ -245,10 +244,5 @@ data class GenerateReportResponse(
     val recipient_email: String
 )
 
-@kotlinx.serialization.Serializable
-data class PaginatedResponse<T>(
-    val count: Int,
-    val next: String?,
-    val previous: String?,
-    val results: List<T>
-)
+// Removed: PaginatedResponse - no longer using paginated responses
+// All API endpoints now return direct lists instead of paginated responses
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/TaskCompletionApi.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/TaskCompletionApi.kt
index da8018c..dc1363a 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/network/TaskCompletionApi.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/network/TaskCompletionApi.kt
@@ -16,8 +16,7 @@ class TaskCompletionApi(private val client: HttpClient = ApiClient.httpClient) {
             }
 
             if (response.status.isSuccess()) {
-                val data: PaginatedResponse<TaskCompletion> = response.body()
-                ApiResult.Success(data.results)
+                ApiResult.Success(response.body())
             } else {
                 ApiResult.Error("Failed to fetch completions", response.status.value)
             }
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt
index 6fb3ee3..a1ebf37 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/CompleteTaskDialog.kt
@@ -102,7 +102,7 @@ fun CompleteTaskDialog(
                         // Contractor list
                         when (val state = contractorsState) {
                             is ApiResult.Success -> {
-                                state.data.results.forEach { contractor ->
+                                state.data.forEach { contractor ->
                                     DropdownMenuItem(
                                         text = {
                                             Column {
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/documents/DocumentsTabContent.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/documents/DocumentsTabContent.kt
index 50e6d0f..996524a 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/documents/DocumentsTabContent.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/components/documents/DocumentsTabContent.kt
@@ -13,13 +13,13 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.mycrib.shared.models.DocumentListResponse
+import com.mycrib.shared.models.Document
 import com.mycrib.shared.network.ApiResult
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DocumentsTabContent(
-    state: ApiResult<DocumentListResponse>,
+    state: ApiResult<List<Document>>,
     isWarrantyTab: Boolean,
     onDocumentClick: (Int) -> Unit,
     onRetry: () -> Unit
@@ -42,7 +42,7 @@ fun DocumentsTabContent(
             }
         }
         is ApiResult.Success -> {
-            val documents = state.data.results
+            val documents = state.data
             if (documents.isEmpty()) {
                 EmptyState(
                     icon = if (isWarrantyTab) Icons.Default.ReceiptLong else Icons.Default.Description,
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/ContractorsScreen.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/ContractorsScreen.kt
index 5f87998..d3a61ff 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/ContractorsScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/ui/screens/ContractorsScreen.kt
@@ -246,7 +246,7 @@ fun ContractorsScreen(
                     }
                 }
             ) { state ->
-                val contractors = state.results
+                val contractors = state
 
                 if (contractors.isEmpty()) {
                     Box(
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/ContractorViewModel.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/ContractorViewModel.kt
index 1188f31..1170cfe 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/ContractorViewModel.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/ContractorViewModel.kt
@@ -11,8 +11,8 @@ import kotlinx.coroutines.launch
 
 class ContractorViewModel : ViewModel() {
 
-    private val _contractorsState = MutableStateFlow<ApiResult<ContractorListResponse>>(ApiResult.Idle)
-    val contractorsState: StateFlow<ApiResult<ContractorListResponse>> = _contractorsState
+    private val _contractorsState = MutableStateFlow<ApiResult<List<ContractorSummary>>>(ApiResult.Idle)
+    val contractorsState: StateFlow<ApiResult<List<ContractorSummary>>> = _contractorsState
 
     private val _contractorDetailState = MutableStateFlow<ApiResult<Contractor>>(ApiResult.Idle)
     val contractorDetailState: StateFlow<ApiResult<Contractor>> = _contractorDetailState
diff --git a/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/DocumentViewModel.kt b/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/DocumentViewModel.kt
index eb5ca47..db10c15 100644
--- a/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/DocumentViewModel.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/mycrib/viewmodel/DocumentViewModel.kt
@@ -12,8 +12,8 @@ import kotlinx.coroutines.launch
 
 class DocumentViewModel : ViewModel() {
 
-    private val _documentsState = MutableStateFlow<ApiResult<DocumentListResponse>>(ApiResult.Idle)
-    val documentsState: StateFlow<ApiResult<DocumentListResponse>> = _documentsState
+    private val _documentsState = MutableStateFlow<ApiResult<List<Document>>>(ApiResult.Idle)
+    val documentsState: StateFlow<ApiResult<List<Document>>> = _documentsState
 
     private val _documentDetailState = MutableStateFlow<ApiResult<Document>>(ApiResult.Idle)
     val documentDetailState: StateFlow<ApiResult<Document>> = _documentDetailState
diff --git a/iosApp/MyCrib/MyCrib.swift b/iosApp/MyCrib/MyCrib.swift
index 2abf840..b3f3c54 100644
--- a/iosApp/MyCrib/MyCrib.swift
+++ b/iosApp/MyCrib/MyCrib.swift
@@ -302,7 +302,7 @@ struct TaskRowView: View {
             VStack(alignment: .leading, spacing: 2) {
                 Text(task.title)
                     .font(.system(size: 11, weight: .semibold))
-                    .lineLimit(1)
+//                    .lineLimit(1)
                     .foregroundStyle(.primary)
                 
                 if let dueDate = task.dueDate {
diff --git a/iosApp/MyCribUITests/ComprehensiveContractorTests.swift b/iosApp/MyCribUITests/ComprehensiveContractorTests.swift
index 8c802eb..c06a15e 100644
--- a/iosApp/MyCribUITests/ComprehensiveContractorTests.swift
+++ b/iosApp/MyCribUITests/ComprehensiveContractorTests.swift
@@ -151,8 +151,55 @@ final class ComprehensiveContractorTests: XCTestCase {
         return true
     }
 
-    private func findContractor(name: String) -> XCUIElement {
-        return app.staticTexts.containing(NSPredicate(format: "label CONTAINS '\(name)'")).firstMatch
+    private func findContractor(name: String, scrollIfNeeded: Bool = true) -> XCUIElement {
+        let element = app.staticTexts.containing(NSPredicate(format: "label CONTAINS[c] %@", name)).firstMatch
+
+        // If element is visible, return it immediately
+        if element.exists && element.isHittable {
+            return element
+        }
+
+        // If scrolling is not needed, return the element as-is
+        guard scrollIfNeeded else {
+            return element
+        }
+
+        // Get the scroll view
+        let scrollView = app.scrollViews.firstMatch
+        guard scrollView.exists else {
+            return element
+        }
+
+        // First, scroll to the top of the list
+        scrollView.swipeDown(velocity: .fast)
+        usleep(30_000) // 0.03 second delay
+
+        // Now scroll down from top, checking after each swipe
+        var lastVisibleRow = ""
+        for _ in 0..<Int.max {
+            // Check if element is now visible
+            if element.exists && element.isHittable {
+                return element
+            }
+
+            // Get the last visible row before swiping
+            let visibleTexts = app.staticTexts.allElementsBoundByIndex.filter { $0.isHittable }
+            let currentLastRow = visibleTexts.last?.label ?? ""
+
+            // If last row hasn't changed, we've reached the end
+            if !lastVisibleRow.isEmpty && currentLastRow == lastVisibleRow {
+                break
+            }
+
+            lastVisibleRow = currentLastRow
+
+            // Scroll down one swipe
+            scrollView.swipeUp(velocity: .slow)
+            usleep(50_000) // 0.05 second delay
+        }
+
+        // Return element (test assertions will handle if not found)
+        return element
     }
 
     // MARK: - Basic Contractor Creation Tests
@@ -249,28 +296,17 @@ final class ComprehensiveContractorTests: XCTestCase {
         sleep(2)
 
         // Tap edit button (may be in menu)
-        let editButton = app.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Edit'")).firstMatch
-        let menuButton = app.buttons.containing(NSPredicate(format: "label CONTAINS 'ellipsis'")).firstMatch
-
-        if menuButton.exists {
-            menuButton.tap()
-            sleep(1)
-            if editButton.exists {
-                editButton.tap()
-                sleep(2)
-            }
-        } else if editButton.exists {
-            editButton.tap()
-            sleep(2)
-        }
+        app/*@START_MENU_TOKEN@*/.images["ellipsis.circle"]/*[[".buttons[\"More\"].images",".buttons",".images[\"More\"]",".images[\"ellipsis.circle\"]"],[[[-1,3],[-1,2],[-1,1,1],[-1,0]],[[-1,3],[-1,2]]],[0]]@END_MENU_TOKEN@*/.firstMatch.tap()
+        app/*@START_MENU_TOKEN@*/.buttons["pencil"]/*[[".buttons.containing(.image, identifier: \"pencil\")",".cells",".buttons[\"Edit\"]",".buttons[\"pencil\"]"],[[[-1,3],[-1,2],[-1,1,1],[-1,0]],[[-1,3],[-1,2]]],[0]]@END_MENU_TOKEN@*/.firstMatch.tap()
 
         // Edit name
         let nameField = app.textFields.containing(NSPredicate(format: "placeholderValue CONTAINS[c] 'Name'")).firstMatch
         if nameField.exists {
             nameField.tap()
-            nameField.doubleTap()
             sleep(1)
-            app.buttons["Select All"].tap()
+            nameField.tap()
+            sleep(1)
+            app.menuItems["Select All"].tap()
             sleep(1)
             nameField.typeText(newName)
 
@@ -315,45 +351,28 @@ final class ComprehensiveContractorTests: XCTestCase {
         sleep(2)
 
         // Tap edit button (may be in menu)
-        let editButton = app.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Edit'")).firstMatch
-        let menuButton = app.buttons.containing(NSPredicate(format: "label CONTAINS 'ellipsis'")).firstMatch
-
-        if menuButton.exists {
-            menuButton.tap()
-            sleep(1)
-            XCTAssertTrue(editButton.exists, "Edit button should exist in menu")
-            editButton.tap()
-            sleep(2)
-        } else if editButton.exists {
-            editButton.tap()
-            sleep(2)
-        } else {
-            XCTFail("Could not find edit button")
-            return
-        }
+        app/*@START_MENU_TOKEN@*/.images["ellipsis.circle"]/*[[".buttons[\"More\"].images",".buttons",".images[\"More\"]",".images[\"ellipsis.circle\"]"],[[[-1,3],[-1,2],[-1,1,1],[-1,0]],[[-1,3],[-1,2]]],[0]]@END_MENU_TOKEN@*/.firstMatch.tap()
+        app/*@START_MENU_TOKEN@*/.buttons["pencil"]/*[[".buttons.containing(.image, identifier: \"pencil\")",".cells",".buttons[\"Edit\"]",".buttons[\"pencil\"]"],[[[-1,3],[-1,2],[-1,1,1],[-1,0]],[[-1,3],[-1,2]]],[0]]@END_MENU_TOKEN@*/.firstMatch.tap()
 
         // Update name
         let nameField = app.textFields.containing(NSPredicate(format: "placeholderValue CONTAINS[c] 'Name'")).firstMatch
         XCTAssertTrue(nameField.exists, "Name field should exist")
         nameField.tap()
-        nameField.doubleTap()
         sleep(1)
-        if app.buttons["Select All"].exists {
-            app.buttons["Select All"].tap()
-            sleep(1)
-        }
+        nameField.tap()
+        sleep(1)
+        app.menuItems["Select All"].tap()
+        sleep(1)
         nameField.typeText(newName)
 
         // Update phone
         let phoneField = app.textFields.containing(NSPredicate(format: "placeholderValue CONTAINS[c] 'Phone'")).firstMatch
         if phoneField.exists {
             phoneField.tap()
-            phoneField.doubleTap()
             sleep(1)
-            if app.buttons["Select All"].exists {
-                app.buttons["Select All"].tap()
-                sleep(1)
-            }
+            phoneField.tap()
+            sleep(1)
+            app.menuItems["Select All"].tap()
             phoneField.typeText(newPhone)
         }
 
@@ -365,12 +384,10 @@ final class ComprehensiveContractorTests: XCTestCase {
         let emailField = app.textFields.containing(NSPredicate(format: "placeholderValue CONTAINS[c] 'Email'")).firstMatch
         if emailField.exists {
             emailField.tap()
-            emailField.doubleTap()
             sleep(1)
-            if app.buttons["Select All"].exists {
-                app.buttons["Select All"].tap()
-                sleep(1)
-            }
+            emailField.tap()
+            sleep(1)
+            app.menuItems["Select All"].tap()
             emailField.typeText(newEmail)
         }
 
@@ -378,12 +395,10 @@ final class ComprehensiveContractorTests: XCTestCase {
         let companyField = app.textFields.containing(NSPredicate(format: "placeholderValue CONTAINS[c] 'Company'")).firstMatch
         if companyField.exists {
             companyField.tap()
-            companyField.doubleTap()
             sleep(1)
-            if app.buttons["Select All"].exists {
-                app.buttons["Select All"].tap()
-                sleep(1)
-            }
+            companyField.tap()
+            sleep(1)
+            app.menuItems["Select All"].tap()
             companyField.typeText(newCompany)
         }
 
@@ -461,26 +476,26 @@ final class ComprehensiveContractorTests: XCTestCase {
         XCTAssertFalse(addButton.isEnabled, "Add button should be disabled when name is empty")
     }
 
-    func testCannotCreateContractorWithEmptyPhone() {
-        guard openContractorForm() else {
-            XCTFail("Failed to open contractor form")
-            return
-        }
-
-        // Fill name but leave phone empty
-        let nameField = app.textFields.containing(NSPredicate(format: "placeholderValue CONTAINS[c] 'Name'")).firstMatch
-        nameField.tap()
-        nameField.typeText("Test Contractor")
-
-        // Scroll to Add button if needed
-        app.swipeUp()
-        sleep(1)
-
-        // When creating, button should say "Add"
-        let addButton = app.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Add'")).firstMatch
-        XCTAssertTrue(addButton.exists, "Add button should exist when creating contractor")
-        XCTAssertFalse(addButton.isEnabled, "Add button should be disabled when phone is empty")
-    }
+//    func testCannotCreateContractorWithEmptyPhone() {
+//        guard openContractorForm() else {
+//            XCTFail("Failed to open contractor form")
+//            return
+//        }
+//
+//        // Fill name but leave phone empty
+//        let nameField = app.textFields.containing(NSPredicate(format: "placeholderValue CONTAINS[c] 'Name'")).firstMatch
+//        nameField.tap()
+//        nameField.typeText("Test Contractor")
+//
+//        // Scroll to Add button if needed
+//        app.swipeUp()
+//        sleep(1)
+//
+//        // When creating, button should say "Add"
+//        let addButton = app.buttons.containing(NSPredicate(format: "label CONTAINS[c] 'Add'")).firstMatch
+//        XCTAssertTrue(addButton.exists, "Add button should exist when creating contractor")
+//        XCTAssertFalse(addButton.isEnabled, "Add button should be disabled when phone is empty")
+//    }
 
     func testCancelContractorCreation() {
         guard openContractorForm() else {
@@ -567,7 +582,7 @@ final class ComprehensiveContractorTests: XCTestCase {
         XCTAssertTrue(success, "Should handle very long names")
 
         // Verify it appears (may be truncated in display)
-        let contractor = app.staticTexts.containing(NSPredicate(format: "label CONTAINS 'John Christopher'")).firstMatch
+        let contractor = findContractor(name: "John Christopher")
         XCTAssertTrue(contractor.waitForExistence(timeout: 10), "Long name contractor should exist")
     }
 
diff --git a/iosApp/iosApp/Contractor/ContractorCard.swift b/iosApp/iosApp/Contractor/ContractorCard.swift
index 0f13ac2..dca4696 100644
--- a/iosApp/iosApp/Contractor/ContractorCard.swift
+++ b/iosApp/iosApp/Contractor/ContractorCard.swift
@@ -25,7 +25,7 @@ struct ContractorCard: View {
                     Text(contractor.name)
                         .font(.title3.weight(.semibold))
                         .foregroundColor(Color.appTextPrimary)
-                        .lineLimit(1)
+//                        .lineLimit(1)
 
                     if contractor.isFavorite {
                         Image(systemName: "star.fill")
@@ -39,7 +39,7 @@ struct ContractorCard: View {
                     Text(company)
                         .font(.body)
                         .foregroundColor(Color.appTextSecondary)
-                        .lineLimit(1)
+//                        .lineLimit(1)
                 }
 
                 // Info row
diff --git a/iosApp/iosApp/Contractor/ContractorDetailView.swift b/iosApp/iosApp/Contractor/ContractorDetailView.swift
index 10b2fe7..0e5d30f 100644
--- a/iosApp/iosApp/Contractor/ContractorDetailView.swift
+++ b/iosApp/iosApp/Contractor/ContractorDetailView.swift
@@ -203,6 +203,7 @@ struct ContractorDetailView: View {
                     viewModel.loadContractorDetail(id: contractorId)
                 }
             )
+            .presentationDetents([.large])
         }
         .alert("Delete Contractor", isPresented: $showingDeleteAlert) {
             Button("Cancel", role: .cancel) {}
diff --git a/iosApp/iosApp/Contractor/ContractorFormSheet.swift b/iosApp/iosApp/Contractor/ContractorFormSheet.swift
index a1c21de..19d9977 100644
--- a/iosApp/iosApp/Contractor/ContractorFormSheet.swift
+++ b/iosApp/iosApp/Contractor/ContractorFormSheet.swift
@@ -38,7 +38,7 @@ struct ContractorFormSheet: View {
     @State private var contractorSpecialties: [ContractorSpecialty] = []
 
     private var specialties: [String] {
-        contractorSpecialties.map { $0.name }
+        return DataCache.shared.contractorSpecialties.value.map { $0.name }
     }
 
     private var canSave: Bool {
@@ -290,11 +290,10 @@ struct ContractorFormSheet: View {
                         }
                     }
                 }
-                .presentationDetents([.medium, .large])
+                .presentationDetents([.large])
             }
             .onAppear {
                 loadContractorData()
-                loadContractorSpecialties()
             }
             .handleErrors(
                 error: viewModel.errorMessage,
@@ -324,16 +323,6 @@ struct ContractorFormSheet: View {
         isFavorite = contractor.isFavorite
     }
 
-    private func loadContractorSpecialties() {
-        Task {
-            await MainActor.run {
-                if let specialties = DataCache.shared.contractorSpecialties.value as? [ContractorSpecialty] {
-                    self.contractorSpecialties = specialties
-                }
-            }
-        }
-    }
-
     // MARK: - Save Action
 
     private func saveContractor() {
diff --git a/iosApp/iosApp/Contractor/ContractorViewModel.swift b/iosApp/iosApp/Contractor/ContractorViewModel.swift
index beb6c41..a227273 100644
--- a/iosApp/iosApp/Contractor/ContractorViewModel.swift
+++ b/iosApp/iosApp/Contractor/ContractorViewModel.swift
@@ -49,9 +49,9 @@ class ContractorViewModel: ObservableObject {
                     await MainActor.run {
                         self.isLoading = true
                     }
-                } else if let success = state as? ApiResultSuccess<ContractorListResponse> {
+                } else if let success = state as? ApiResultSuccess<NSArray> {
                     await MainActor.run {
-                        self.contractors = success.data?.results ?? []
+                        self.contractors = success.data as? [ContractorSummary] ?? []
                         self.isLoading = false
                     }
                     break
diff --git a/iosApp/iosApp/Contractor/ContractorsListView.swift b/iosApp/iosApp/Contractor/ContractorsListView.swift
index a9827f7..d8e8ede 100644
--- a/iosApp/iosApp/Contractor/ContractorsListView.swift
+++ b/iosApp/iosApp/Contractor/ContractorsListView.swift
@@ -159,6 +159,7 @@ struct ContractorsListView: View {
                         loadContractors()
                     }
                 )
+                .presentationDetents([.large])
             }
             .onAppear {
                 loadContractors()
@@ -183,8 +184,17 @@ struct ContractorsListView: View {
 
     private func loadContractorSpecialties() {
         Task {
+            // Small delay to ensure DataCache is populated
+            try? await Task.sleep(nanoseconds: 100_000_000) // 0.1 seconds
+
             await MainActor.run {
-                self.contractorSpecialties = DataCache.shared.contractorSpecialties.value as! [ContractorSpecialty]
+                if let specialties = DataCache.shared.contractorSpecialties.value as? [ContractorSpecialty] {
+                    self.contractorSpecialties = specialties
+                    print("✅ ContractorsList: Loaded \(specialties.count) contractor specialties")
+                } else {
+                    print("❌ ContractorsList: Failed to load contractor specialties from DataCache")
+                    self.contractorSpecialties = []
+                }
             }
         }
     }
diff --git a/iosApp/iosApp/Documents/Components/DocumentCard.swift b/iosApp/iosApp/Documents/Components/DocumentCard.swift
index be96b9a..b98ff5e 100644
--- a/iosApp/iosApp/Documents/Components/DocumentCard.swift
+++ b/iosApp/iosApp/Documents/Components/DocumentCard.swift
@@ -42,7 +42,7 @@ struct DocumentCard: View {
                     .font(.title3.weight(.semibold))
                     .fontWeight(.bold)
                     .foregroundColor(Color.appTextPrimary)
-                    .lineLimit(1)
+//                    .lineLimit(1)
 
                 if let description = document.description_, !description.isEmpty {
                     Text(description)
diff --git a/iosApp/iosApp/Documents/DocumentViewModel.swift b/iosApp/iosApp/Documents/DocumentViewModel.swift
index 9f1d8f4..cb593e9 100644
--- a/iosApp/iosApp/Documents/DocumentViewModel.swift
+++ b/iosApp/iosApp/Documents/DocumentViewModel.swift
@@ -49,9 +49,9 @@ class DocumentViewModel: ObservableObject {
                     await MainActor.run {
                         self.isLoading = true
                     }
-                } else if let success = state as? ApiResultSuccess<DocumentListResponse> {
+                } else if let success = state as? ApiResultSuccess<NSArray> {
                     await MainActor.run {
-                        self.documents = success.data?.results as? [Document] ?? []
+                        self.documents = success.data as? [Document] ?? []
                         self.isLoading = false
                     }
                     break
diff --git a/iosApp/iosApp/Documents/DocumentViewModelWrapper.swift b/iosApp/iosApp/Documents/DocumentViewModelWrapper.swift
index 36c6902..aae7df0 100644
--- a/iosApp/iosApp/Documents/DocumentViewModelWrapper.swift
+++ b/iosApp/iosApp/Documents/DocumentViewModelWrapper.swift
@@ -94,8 +94,8 @@ class DocumentViewModelWrapper: ObservableObject {
                 )
 
                 await MainActor.run {
-                    if let success = result as? ApiResultSuccess<DocumentListResponse> {
-                        let documents = success.data?.results as? [Document] ?? []
+                    if let success = result as? ApiResultSuccess<NSArray> {
+                        let documents = success.data as? [Document] ?? []
                         self.documentsState = DocumentStateSuccess(documents: documents)
                     } else if let error = result as? ApiResultError {
                         self.documentsState = DocumentStateError(message: error.message)
diff --git a/iosApp/iosApp/Subviews/Residence/ResidenceCard.swift b/iosApp/iosApp/Subviews/Residence/ResidenceCard.swift
index 119c5f7..b7f33d8 100644
--- a/iosApp/iosApp/Subviews/Residence/ResidenceCard.swift
+++ b/iosApp/iosApp/Subviews/Residence/ResidenceCard.swift
@@ -24,7 +24,7 @@ struct ResidenceCard: View {
                         .font(.title3.weight(.semibold))
                         .fontWeight(.bold)
                         .foregroundColor(Color.appTextPrimary)
-                        .lineLimit(1)
+//                        .lineLimit(1)
 
                     if let propertyType = residence.propertyType {
                         Text(propertyType)