diff --git a/lib/features/todo/data/datasources/todo_remote_datasource.dart b/lib/features/todo/data/datasources/todo_remote_datasource.dart
index 6b1878f..16218f3 100644
--- a/lib/features/todo/data/datasources/todo_remote_datasource.dart
+++ b/lib/features/todo/data/datasources/todo_remote_datasource.dart
@@ -10,14 +10,13 @@ import '../models/todo_dto.dart';
 @injectable
 class TodoRemoteDataSource {
   final http.Client _client;
-  // TODO: Replace this with the URL we provide you
-  final String baseUrl = 'https://6825aa0f0f0188d7e72ddd9a.mockapi.io/api/v1';
+  final String baseUrl = 'https://6835753ccd78db2058c196b3.mockapi.io/';
 
   TodoRemoteDataSource(this._client);
 
   Future<List<TodoDTO>> getTodos() async {
     try {
-      final response = await _client.get(Uri.parse('$baseUrl/todos'));
+      final response = await _client.get(Uri.parse('$baseUrl/todo'));
 
       if (response.statusCode == 200) {
         final List<dynamic> jsonList = json.decode(response.body);
@@ -32,14 +31,21 @@ class TodoRemoteDataSource {
     }
   }
 
-  Future<TodoDTO> addTodo(String title) async {
+  Future<TodoDTO> addTodo(String title, String? description, String? imageUrl) async {
     try {
-      final newTodo = {'title': title, 'createdAtSeconds': DateTime.now().millisecondsSinceEpoch ~/ 1000};
+      final newTodo = {
+        'id': generateId(),
+        'title': title,
+        'description': description,
+        'imageUrl': imageUrl,
+        'createdAtSeconds': DateTime.now().millisecondsSinceEpoch ~/ 1000,
+        'isDone': false,
+      };
 
       log('Sending todo: ${json.encode(newTodo)}');
 
       final response = await _client.post(
-        Uri.parse('$baseUrl/todos'),
+        Uri.parse('$baseUrl/todo'),
         headers: {'Content-Type': 'application/json'},
         body: json.encode(newTodo),
       );
@@ -61,6 +67,31 @@ class TodoRemoteDataSource {
     }
   }
 
+  Future<TodoDTO> updateDone(String id, bool isDone) async {
+    try {
+      log('Updating todo: $id, $isDone');
+
+      final response = await _client.put(
+        Uri.parse('$baseUrl/todo/$id'),
+        headers: {'Content-Type': 'application/json'},
+        body: json.encode({'isDone': isDone}),
+      );
+
+      log('Response status: ${response.statusCode}');
+      log('Response body: ${response.body}');
+
+      if (response.statusCode == 200) {
+        final Map<String, dynamic> responseData = json.decode(response.body);
+        return TodoDTO.fromJson(responseData);
+      } else {
+        throw Exception('Failed to update todo: ${response.statusCode}');
+      }
+    } catch (e) {
+      log('Error updating todo: $e');
+      throw Exception('Failed to update todo: $e');
+    }
+  }
+
   // For local client-side ID generation
   String generateId() {
     return const Uuid().v4();
diff --git a/lib/features/todo/data/models/todo_dto.dart b/lib/features/todo/data/models/todo_dto.dart
index 8d9d649..d3974c0 100644
--- a/lib/features/todo/data/models/todo_dto.dart
+++ b/lib/features/todo/data/models/todo_dto.dart
@@ -10,6 +10,9 @@ class TodoDTO with _$TodoDTO {
   const factory TodoDTO({
     required String id,
     required String title,
+    required String description,
+    required String imageUrl,
+    required bool isDone,
     int? createdAtSeconds,
   }) = _TodoDTO;
 
diff --git a/lib/features/todo/data/models/todo_dto.freezed.dart b/lib/features/todo/data/models/todo_dto.freezed.dart
index 752b03e..37bd679 100644
--- a/lib/features/todo/data/models/todo_dto.freezed.dart
+++ b/lib/features/todo/data/models/todo_dto.freezed.dart
@@ -23,6 +23,9 @@ TodoDTO _$TodoDTOFromJson(Map<String, dynamic> json) {
 mixin _$TodoDTO {
   String get id => throw _privateConstructorUsedError;
   String get title => throw _privateConstructorUsedError;
+  String get description => throw _privateConstructorUsedError;
+  String get imageUrl => throw _privateConstructorUsedError;
+  bool get isDone => throw _privateConstructorUsedError;
   int? get createdAtSeconds => throw _privateConstructorUsedError;
 
   /// Serializes this TodoDTO to a JSON map.
@@ -39,7 +42,14 @@ abstract class $TodoDTOCopyWith<$Res> {
   factory $TodoDTOCopyWith(TodoDTO value, $Res Function(TodoDTO) then) =
       _$TodoDTOCopyWithImpl<$Res, TodoDTO>;
   @useResult
-  $Res call({String id, String title, int? createdAtSeconds});
+  $Res call({
+    String id,
+    String title,
+    String description,
+    String imageUrl,
+    bool isDone,
+    int? createdAtSeconds,
+  });
 }
 
 /// @nodoc
@@ -59,6 +69,9 @@ class _$TodoDTOCopyWithImpl<$Res, $Val extends TodoDTO>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? description = null,
+    Object? imageUrl = null,
+    Object? isDone = null,
     Object? createdAtSeconds = freezed,
   }) {
     return _then(
@@ -73,6 +86,21 @@ class _$TodoDTOCopyWithImpl<$Res, $Val extends TodoDTO>
                     ? _value.title
                     : title // ignore: cast_nullable_to_non_nullable
                         as String,
+            description:
+                null == description
+                    ? _value.description
+                    : description // ignore: cast_nullable_to_non_nullable
+                        as String,
+            imageUrl:
+                null == imageUrl
+                    ? _value.imageUrl
+                    : imageUrl // ignore: cast_nullable_to_non_nullable
+                        as String,
+            isDone:
+                null == isDone
+                    ? _value.isDone
+                    : isDone // ignore: cast_nullable_to_non_nullable
+                        as bool,
             createdAtSeconds:
                 freezed == createdAtSeconds
                     ? _value.createdAtSeconds
@@ -92,7 +120,14 @@ abstract class _$$TodoDTOImplCopyWith<$Res> implements $TodoDTOCopyWith<$Res> {
   ) = __$$TodoDTOImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String id, String title, int? createdAtSeconds});
+  $Res call({
+    String id,
+    String title,
+    String description,
+    String imageUrl,
+    bool isDone,
+    int? createdAtSeconds,
+  });
 }
 
 /// @nodoc
@@ -111,6 +146,9 @@ class __$$TodoDTOImplCopyWithImpl<$Res>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? description = null,
+    Object? imageUrl = null,
+    Object? isDone = null,
     Object? createdAtSeconds = freezed,
   }) {
     return _then(
@@ -125,6 +163,21 @@ class __$$TodoDTOImplCopyWithImpl<$Res>
                 ? _value.title
                 : title // ignore: cast_nullable_to_non_nullable
                     as String,
+        description:
+            null == description
+                ? _value.description
+                : description // ignore: cast_nullable_to_non_nullable
+                    as String,
+        imageUrl:
+            null == imageUrl
+                ? _value.imageUrl
+                : imageUrl // ignore: cast_nullable_to_non_nullable
+                    as String,
+        isDone:
+            null == isDone
+                ? _value.isDone
+                : isDone // ignore: cast_nullable_to_non_nullable
+                    as bool,
         createdAtSeconds:
             freezed == createdAtSeconds
                 ? _value.createdAtSeconds
@@ -141,6 +194,9 @@ class _$TodoDTOImpl extends _TodoDTO {
   const _$TodoDTOImpl({
     required this.id,
     required this.title,
+    required this.description,
+    required this.imageUrl,
+    required this.isDone,
     this.createdAtSeconds,
   }) : super._();
 
@@ -152,11 +208,17 @@ class _$TodoDTOImpl extends _TodoDTO {
   @override
   final String title;
   @override
+  final String description;
+  @override
+  final String imageUrl;
+  @override
+  final bool isDone;
+  @override
   final int? createdAtSeconds;
 
   @override
   String toString() {
-    return 'TodoDTO(id: $id, title: $title, createdAtSeconds: $createdAtSeconds)';
+    return 'TodoDTO(id: $id, title: $title, description: $description, imageUrl: $imageUrl, isDone: $isDone, createdAtSeconds: $createdAtSeconds)';
   }
 
   @override
@@ -166,13 +228,26 @@ class _$TodoDTOImpl extends _TodoDTO {
             other is _$TodoDTOImpl &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.title, title) || other.title == title) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.imageUrl, imageUrl) ||
+                other.imageUrl == imageUrl) &&
+            (identical(other.isDone, isDone) || other.isDone == isDone) &&
             (identical(other.createdAtSeconds, createdAtSeconds) ||
                 other.createdAtSeconds == createdAtSeconds));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, title, createdAtSeconds);
+  int get hashCode => Object.hash(
+    runtimeType,
+    id,
+    title,
+    description,
+    imageUrl,
+    isDone,
+    createdAtSeconds,
+  );
 
   /// Create a copy of TodoDTO
   /// with the given fields replaced by the non-null parameter values.
@@ -192,6 +267,9 @@ abstract class _TodoDTO extends TodoDTO {
   const factory _TodoDTO({
     required final String id,
     required final String title,
+    required final String description,
+    required final String imageUrl,
+    required final bool isDone,
     final int? createdAtSeconds,
   }) = _$TodoDTOImpl;
   const _TodoDTO._() : super._();
@@ -203,6 +281,12 @@ abstract class _TodoDTO extends TodoDTO {
   @override
   String get title;
   @override
+  String get description;
+  @override
+  String get imageUrl;
+  @override
+  bool get isDone;
+  @override
   int? get createdAtSeconds;
 
   /// Create a copy of TodoDTO
diff --git a/lib/features/todo/data/models/todo_dto.g.dart b/lib/features/todo/data/models/todo_dto.g.dart
index bada3c6..0a23684 100644
--- a/lib/features/todo/data/models/todo_dto.g.dart
+++ b/lib/features/todo/data/models/todo_dto.g.dart
@@ -10,6 +10,9 @@ _$TodoDTOImpl _$$TodoDTOImplFromJson(Map<String, dynamic> json) =>
     _$TodoDTOImpl(
       id: json['id'] as String,
       title: json['title'] as String,
+      description: json['description'] as String,
+      imageUrl: json['imageUrl'] as String,
+      isDone: json['isDone'] as bool,
       createdAtSeconds: (json['createdAtSeconds'] as num?)?.toInt(),
     );
 
@@ -17,5 +20,8 @@ Map<String, dynamic> _$$TodoDTOImplToJson(_$TodoDTOImpl instance) =>
     <String, dynamic>{
       'id': instance.id,
       'title': instance.title,
+      'description': instance.description,
+      'imageUrl': instance.imageUrl,
+      'isDone': instance.isDone,
       'createdAtSeconds': instance.createdAtSeconds,
     };
diff --git a/lib/features/todo/data/repositories/todo_repository.dart b/lib/features/todo/data/repositories/todo_repository.dart
index 49e63b0..c241f24 100644
--- a/lib/features/todo/data/repositories/todo_repository.dart
+++ b/lib/features/todo/data/repositories/todo_repository.dart
@@ -34,15 +34,25 @@ class TodoRepository {
   }
 
   // Add a new todo remotely
-  Future<void> addTodo(String title) async {
+  Future<void> addTodo(String title, String? description, String? imageUrl) async {
     try {
       // Add todo remotely
-      await remoteDataSource.addTodo(title);
+      await remoteDataSource.addTodo(title, description, imageUrl);
     } catch (e) {
       log('Error adding remote todo: $e');
     }
   }
 
+  Future<TodoModel> updateTodo(String id, bool isDone) async {
+    try {
+      final remoteDto = await remoteDataSource.updateDone(id, isDone);
+      return _mapDtoToModel(remoteDto);
+    } catch (e) {
+      log('Error updating remote todo: $e');
+      throw Exception('Failed to update todo: $e');
+    }
+  }
+
   // Helper method to map DTOs to domain models
   TodoModel _mapDtoToModel(TodoDTO dto) {
     try {
@@ -51,10 +61,10 @@ class TodoRepository {
         createdAt = DateTime.fromMillisecondsSinceEpoch(dto.createdAtSeconds! * 1000);
       }
 
-      return TodoModel(id: dto.id, title: dto.title, createdAt: createdAt);
+      return TodoModel(id: dto.id, title: dto.title, description: dto.description, imageUrl: dto.imageUrl, isDone: dto.isDone, createdAt: createdAt);
     } catch (e) {
       log('Error mapping DTO to model: $e');
-      return TodoModel(id: const Uuid().v4(), title: 'Unknown title', createdAt: DateTime.now());
+      return TodoModel(id: const Uuid().v4(), title: 'Unknown title', description: 'Unknown description', imageUrl: 'Unknown imageUrl', isDone: false, createdAt: DateTime.now());
     }
   }
 }
diff --git a/lib/features/todo/domain/models/todo_model.dart b/lib/features/todo/domain/models/todo_model.dart
index 606a711..7f6515c 100644
--- a/lib/features/todo/domain/models/todo_model.dart
+++ b/lib/features/todo/domain/models/todo_model.dart
@@ -8,8 +8,14 @@ part 'todo_model.g.dart';
 class TodoModel with _$TodoModel {
   const TodoModel._();
 
-  const factory TodoModel({required String id, required String title, DateTime? createdAt}) =
-      _TodoModel;
+  const factory TodoModel({
+    required String id,
+    required String title,
+    required String description,
+    required String imageUrl,
+    required bool isDone,
+    DateTime? createdAt,
+  }) = _TodoModel;
 
   DateTime get effectiveCreatedAt => createdAt ?? DateTime.now();
 
diff --git a/lib/features/todo/domain/models/todo_model.freezed.dart b/lib/features/todo/domain/models/todo_model.freezed.dart
index 6052b7a..b9bd72c 100644
--- a/lib/features/todo/domain/models/todo_model.freezed.dart
+++ b/lib/features/todo/domain/models/todo_model.freezed.dart
@@ -23,6 +23,9 @@ TodoModel _$TodoModelFromJson(Map<String, dynamic> json) {
 mixin _$TodoModel {
   String get id => throw _privateConstructorUsedError;
   String get title => throw _privateConstructorUsedError;
+  String get description => throw _privateConstructorUsedError;
+  String get imageUrl => throw _privateConstructorUsedError;
+  bool get isDone => throw _privateConstructorUsedError;
   DateTime? get createdAt => throw _privateConstructorUsedError;
 
   /// Serializes this TodoModel to a JSON map.
@@ -40,7 +43,14 @@ abstract class $TodoModelCopyWith<$Res> {
   factory $TodoModelCopyWith(TodoModel value, $Res Function(TodoModel) then) =
       _$TodoModelCopyWithImpl<$Res, TodoModel>;
   @useResult
-  $Res call({String id, String title, DateTime? createdAt});
+  $Res call({
+    String id,
+    String title,
+    String description,
+    String imageUrl,
+    bool isDone,
+    DateTime? createdAt,
+  });
 }
 
 /// @nodoc
@@ -60,6 +70,9 @@ class _$TodoModelCopyWithImpl<$Res, $Val extends TodoModel>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? description = null,
+    Object? imageUrl = null,
+    Object? isDone = null,
     Object? createdAt = freezed,
   }) {
     return _then(
@@ -74,6 +87,21 @@ class _$TodoModelCopyWithImpl<$Res, $Val extends TodoModel>
                     ? _value.title
                     : title // ignore: cast_nullable_to_non_nullable
                         as String,
+            description:
+                null == description
+                    ? _value.description
+                    : description // ignore: cast_nullable_to_non_nullable
+                        as String,
+            imageUrl:
+                null == imageUrl
+                    ? _value.imageUrl
+                    : imageUrl // ignore: cast_nullable_to_non_nullable
+                        as String,
+            isDone:
+                null == isDone
+                    ? _value.isDone
+                    : isDone // ignore: cast_nullable_to_non_nullable
+                        as bool,
             createdAt:
                 freezed == createdAt
                     ? _value.createdAt
@@ -94,7 +122,14 @@ abstract class _$$TodoModelImplCopyWith<$Res>
   ) = __$$TodoModelImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String id, String title, DateTime? createdAt});
+  $Res call({
+    String id,
+    String title,
+    String description,
+    String imageUrl,
+    bool isDone,
+    DateTime? createdAt,
+  });
 }
 
 /// @nodoc
@@ -113,6 +148,9 @@ class __$$TodoModelImplCopyWithImpl<$Res>
   $Res call({
     Object? id = null,
     Object? title = null,
+    Object? description = null,
+    Object? imageUrl = null,
+    Object? isDone = null,
     Object? createdAt = freezed,
   }) {
     return _then(
@@ -127,6 +165,21 @@ class __$$TodoModelImplCopyWithImpl<$Res>
                 ? _value.title
                 : title // ignore: cast_nullable_to_non_nullable
                     as String,
+        description:
+            null == description
+                ? _value.description
+                : description // ignore: cast_nullable_to_non_nullable
+                    as String,
+        imageUrl:
+            null == imageUrl
+                ? _value.imageUrl
+                : imageUrl // ignore: cast_nullable_to_non_nullable
+                    as String,
+        isDone:
+            null == isDone
+                ? _value.isDone
+                : isDone // ignore: cast_nullable_to_non_nullable
+                    as bool,
         createdAt:
             freezed == createdAt
                 ? _value.createdAt
@@ -140,8 +193,14 @@ class __$$TodoModelImplCopyWithImpl<$Res>
 /// @nodoc
 @JsonSerializable()
 class _$TodoModelImpl extends _TodoModel {
-  const _$TodoModelImpl({required this.id, required this.title, this.createdAt})
-    : super._();
+  const _$TodoModelImpl({
+    required this.id,
+    required this.title,
+    required this.description,
+    required this.imageUrl,
+    required this.isDone,
+    this.createdAt,
+  }) : super._();
 
   factory _$TodoModelImpl.fromJson(Map<String, dynamic> json) =>
       _$$TodoModelImplFromJson(json);
@@ -151,11 +210,17 @@ class _$TodoModelImpl extends _TodoModel {
   @override
   final String title;
   @override
+  final String description;
+  @override
+  final String imageUrl;
+  @override
+  final bool isDone;
+  @override
   final DateTime? createdAt;
 
   @override
   String toString() {
-    return 'TodoModel(id: $id, title: $title, createdAt: $createdAt)';
+    return 'TodoModel(id: $id, title: $title, description: $description, imageUrl: $imageUrl, isDone: $isDone, createdAt: $createdAt)';
   }
 
   @override
@@ -165,13 +230,26 @@ class _$TodoModelImpl extends _TodoModel {
             other is _$TodoModelImpl &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.title, title) || other.title == title) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.imageUrl, imageUrl) ||
+                other.imageUrl == imageUrl) &&
+            (identical(other.isDone, isDone) || other.isDone == isDone) &&
             (identical(other.createdAt, createdAt) ||
                 other.createdAt == createdAt));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, title, createdAt);
+  int get hashCode => Object.hash(
+    runtimeType,
+    id,
+    title,
+    description,
+    imageUrl,
+    isDone,
+    createdAt,
+  );
 
   /// Create a copy of TodoModel
   /// with the given fields replaced by the non-null parameter values.
@@ -191,6 +269,9 @@ abstract class _TodoModel extends TodoModel {
   const factory _TodoModel({
     required final String id,
     required final String title,
+    required final String description,
+    required final String imageUrl,
+    required final bool isDone,
     final DateTime? createdAt,
   }) = _$TodoModelImpl;
   const _TodoModel._() : super._();
@@ -203,6 +284,12 @@ abstract class _TodoModel extends TodoModel {
   @override
   String get title;
   @override
+  String get description;
+  @override
+  String get imageUrl;
+  @override
+  bool get isDone;
+  @override
   DateTime? get createdAt;
 
   /// Create a copy of TodoModel
diff --git a/lib/features/todo/domain/models/todo_model.g.dart b/lib/features/todo/domain/models/todo_model.g.dart
index 6512f96..d9f7a1a 100644
--- a/lib/features/todo/domain/models/todo_model.g.dart
+++ b/lib/features/todo/domain/models/todo_model.g.dart
@@ -10,6 +10,9 @@ _$TodoModelImpl _$$TodoModelImplFromJson(Map<String, dynamic> json) =>
     _$TodoModelImpl(
       id: json['id'] as String,
       title: json['title'] as String,
+      description: json['description'] as String,
+      imageUrl: json['imageUrl'] as String,
+      isDone: json['isDone'] as bool,
       createdAt:
           json['createdAt'] == null
               ? null
@@ -20,5 +23,8 @@ Map<String, dynamic> _$$TodoModelImplToJson(_$TodoModelImpl instance) =>
     <String, dynamic>{
       'id': instance.id,
       'title': instance.title,
+      'description': instance.description,
+      'imageUrl': instance.imageUrl,
+      'isDone': instance.isDone,
       'createdAt': instance.createdAt?.toIso8601String(),
     };
diff --git a/lib/features/todo/presentation/cubits/todo_cubit.dart b/lib/features/todo/presentation/cubits/todo_cubit.dart
index f1805f4..6d53056 100644
--- a/lib/features/todo/presentation/cubits/todo_cubit.dart
+++ b/lib/features/todo/presentation/cubits/todo_cubit.dart
@@ -21,13 +21,28 @@ class TodoCubit extends Cubit<TodoState> {
     }
   }
 
-  Future<void> addTodo(String title) async {
+  Future<void> addTodo(String title, String? description, String? imageUrl) async {
     try {
       emit(TodosLoading());
-      await _repository.addTodo(title);
+      await _repository.addTodo(title, description, imageUrl);
       await loadTodos();
     } catch (e) {
       emit(TodosError(message: e.toString()));
     }
   }
+
+  Future<void> updateDone(String id, bool isDone, List<TodoModel> todos) async {
+    try {
+      final updatedTodos =
+          todos
+              .map(
+                (todo) => todo.id == id ? todo.copyWith(isDone: isDone) : todo,
+              )
+              .toList();
+      emit(TodosLoaded(todos: updatedTodos));
+      await _repository.updateTodo(id, isDone);
+    } catch (e) {
+      emit(TodosError(message: e.toString()));
+    }
+  }
 }
diff --git a/lib/features/todo/presentation/screens/todo_form_screen.dart b/lib/features/todo/presentation/screens/todo_form_screen.dart
index cf54e93..4848746 100644
--- a/lib/features/todo/presentation/screens/todo_form_screen.dart
+++ b/lib/features/todo/presentation/screens/todo_form_screen.dart
@@ -13,6 +13,8 @@ class TodoFormScreen extends StatefulWidget {
 class _TodoFormScreenState extends State<TodoFormScreen> {
   final _formKey = GlobalKey<FormState>();
   final _titleController = TextEditingController();
+  final _descriptionController = TextEditingController();
+  final _imageUrlController = TextEditingController();
 
   @override
   void dispose() {
@@ -22,7 +24,7 @@ class _TodoFormScreenState extends State<TodoFormScreen> {
 
   void _submitForm() {
     if (_formKey.currentState?.validate() ?? false) {
-      context.read<TodoCubit>().addTodo(_titleController.text);
+      context.read<TodoCubit>().addTodo(_titleController.text, _descriptionController.text, _imageUrlController.text);
       Navigator.pop(context);
     }
   }
@@ -50,6 +52,16 @@ class _TodoFormScreenState extends State<TodoFormScreen> {
                 },
               ),
               const SizedBox(height: 24),
+              TextFormField(
+                controller: _descriptionController,
+                decoration: const InputDecoration(labelText: 'Description', border: OutlineInputBorder()),
+              ),
+              const SizedBox(height: 24),
+              TextFormField(
+                controller: _imageUrlController,
+                decoration: const InputDecoration(labelText: 'Image URL', border: OutlineInputBorder()),
+              ),
+              const SizedBox(height: 24),
               ElevatedButton(
                 onPressed: _submitForm,
                 style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16)),
diff --git a/lib/features/todo/presentation/screens/todo_list_screen.dart b/lib/features/todo/presentation/screens/todo_list_screen.dart
index a366ba1..1b725c5 100644
--- a/lib/features/todo/presentation/screens/todo_list_screen.dart
+++ b/lib/features/todo/presentation/screens/todo_list_screen.dart
@@ -34,12 +34,21 @@ class TodoListScreen extends StatelessWidget {
 
             return ListView.builder(
               itemCount: todos.length,
-              itemBuilder: (context, index) {
-                return TodoItem(todo: todos[index]);
-              },
+              itemBuilder:
+                  (context, index) => TodoItem(
+                    todo: todos[index],
+                    onToggled: (isDone) {
+                      todoCubit.updateDone(todos[index].id, isDone, todos);
+                    },
+                  ),
             );
           } else if (state is TodosError) {
-            return Center(child: Text('Error: ${state.message}', style: const TextStyle(color: Colors.red)));
+            return Center(
+              child: Text(
+                'Error: ${state.message}',
+                style: const TextStyle(color: Colors.red),
+              ),
+            );
           }
 
           return const Center(child: Text('Unknown state'));
@@ -50,7 +59,11 @@ class TodoListScreen extends StatelessWidget {
           Navigator.push(
             context,
             MaterialPageRoute(
-              builder: (context) => BlocProvider.value(value: todoCubit, child: const TodoFormScreen()),
+              builder:
+                  (context) => BlocProvider.value(
+                    value: todoCubit,
+                    child: const TodoFormScreen(),
+                  ),
             ),
           );
         },
diff --git a/lib/features/todo/presentation/widgets/todo_item.dart b/lib/features/todo/presentation/widgets/todo_item.dart
index 0930dea..d488a10 100644
--- a/lib/features/todo/presentation/widgets/todo_item.dart
+++ b/lib/features/todo/presentation/widgets/todo_item.dart
@@ -4,8 +4,9 @@ import '../../domain/models/todo_model.dart';
 
 class TodoItem extends StatelessWidget {
   final TodoModel todo;
+  final Function(bool) onToggled;
 
-  const TodoItem({super.key, required this.todo});
+  const TodoItem({super.key, required this.todo, required this.onToggled});
 
   @override
   Widget build(BuildContext context) {
@@ -17,12 +18,48 @@ class TodoItem extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(todo.title, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+            todo.imageUrl.isNotEmpty
+                ? Center(
+                  child: AspectRatio(
+                    aspectRatio: 1 / 1, // A square (1:1 ratio)
+                    child: Image.network(
+                      todo.imageUrl,
+                      fit: BoxFit.cover, // Cover the entire area
+                    ),
+                  ),
+                )
+                : const SizedBox.shrink(),
+            const SizedBox(height: 10),
+            Row(
+              children: [
+                Checkbox(value: todo.isDone, onChanged: (value) {
+                  onToggled(value ?? false);
+                }),
+                Text(
+                  todo.title,
+                  style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                ),
+              ],
+            ),
             const SizedBox(height: 4),
             Text(
               todo.formattedDate,
-              style: TextStyle(fontSize: 12, color: Colors.grey[600], fontStyle: FontStyle.italic),
+              style: TextStyle(
+                fontSize: 12,
+                color: Colors.grey[600],
+                fontStyle: FontStyle.italic,
+              ),
             ),
+            todo.description.isNotEmpty
+                ? const SizedBox(height: 10)
+                : const SizedBox.shrink(),
+            todo.description.isNotEmpty
+                ? Text(
+                  todo.description,
+                  maxLines: 2,
+                  style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+                )
+                : const SizedBox.shrink(),
           ],
         ),
       ),