diff --git a/api/src/controllers/newsController.js b/api/src/controllers/newsController.js
index ace3a6066..7cbe0d0eb 100644
--- a/api/src/controllers/newsController.js
+++ b/api/src/controllers/newsController.js
@@ -44,11 +44,11 @@ const addNews = (req, res) => {
   if (req.file) {
     filename = req.file.filename
   }
+
   const {
     title, message, docType, readTime, language, creator, textDetail, imageDetail, videoDetail, category
   } = req.body
   db.News.create({
-    // _attachments: 'uploads/' + req.file.filename,
     _attachments: 'news/' + filename,
     title,
     message,
@@ -62,7 +62,7 @@ const addNews = (req, res) => {
     category,
     communityId: req.params.id
   })
-    .then(() => res.json({ message: 'News Created !!!' }).status(200))
+    .then((data) => res.json({ data }).status(200))
     .catch((err) => res.json({ error: err.message }).status(400))
 }
 
@@ -140,7 +140,17 @@ const getNewsById = (req, res) => {
       model: db.Community,
       attributes: [],
       where: { id: req.params.id }
-    }]
+    }, 
+    {
+      model: db.Text,
+    }, 
+    {
+      model: db.Photo,
+    }, 
+    {
+      model: db.Video,
+    }
+  ]
   })
     .then(news => {
       if (news) {
diff --git a/api/src/controllers/photoController.js b/api/src/controllers/photoController.js
index 2e81b0513..a942b94aa 100644
--- a/api/src/controllers/photoController.js
+++ b/api/src/controllers/photoController.js
@@ -54,30 +54,33 @@ const addphoto = async (req, res) => {
   })
 }
 
-const deletePhoto = async (req, res) => {
-  const { id } = req.params
-  const photo = await db.Photo.destroy({ where: { id } })
-  if (!photo) {
-    throw new NotFoundError()
+const updatePhoto = async (req, res) => {
+  let lessonImg = ''
+
+  const singlePhoto = await db.Photo.findOne({where: {id: req.params.id}});
+  if (req.file) {
+    lessonImg = req.file.filename
+  } else {
+    lessonImg = singlePhoto.dataValues.lessonImg
   }
-  res.status(202).json({
+  
+  const photo = await db.Photo.update({ ...req.body, lessonImg }, {where: {id: req.params.id}})
+  res.status(201).json({
     status: true,
-    message: 'Lesson photo deleted successfully',
+    message: 'photo updated successfully',
     data: photo
   })
 }
 
-const updatePhoto = async (req, res) => {
+const deletePhoto = async (req, res) => {
   const { id } = req.params
-  const photo = await db.Photo.update(req.body, {
-    where: { id }
-  })
+  const photo = await db.Photo.destroy({ where: { id } })
   if (!photo) {
     throw new NotFoundError()
   }
   res.status(202).json({
     status: true,
-    message: 'Lesson photo updated successfully',
+    message: 'Lesson photo deleted successfully',
     data: photo
   })
 }
diff --git a/api/src/controllers/textController.js b/api/src/controllers/textController.js
index c70a0cde8..c4e05a122 100644
--- a/api/src/controllers/textController.js
+++ b/api/src/controllers/textController.js
@@ -37,14 +37,10 @@ const addText = async (req, res) => {
 
 const deleteText = async (req, res) => {
   const { id } = req.params
-  const text = await db.Text.destroy({ where: { id } })
-  if (!text) {
-    throw new NotFoundError()
-  }
+  await db.Text.destroy({ where: { id } })
   res.status(202).json({
     status: true,
     message: 'Lesson text deleted successfully',
-    data: text
   })
 }
 
diff --git a/api/src/controllers/videoController.js b/api/src/controllers/videoController.js
index 5be669be9..175d17c62 100644
--- a/api/src/controllers/videoController.js
+++ b/api/src/controllers/videoController.js
@@ -52,7 +52,7 @@ const addVideo = async (req, res) => {
       videoResource = req.files.videoResource[0].filename
     }
   }
-  // console.log(req)
+  
   const video = await db.Video.create({
     ...req.body,
     videoCover,
@@ -78,13 +78,30 @@ const deleteVideo = async (req, res) => {
 
 const updateVideo = async (req, res) => {
   const { id } = req.params
-  const video = await db.Video.update(req.body, {
+  const video = await db.Video.findOne({
     where: { id }
   })
+    
+  let videoCover = ''
+  let videoResource = ''
+
+  if(req.files.videoCover === undefined) {
+    videoCover = video.dataValues.videoCover
+    videoResource = video.dataValues.videoResource
+  } else {
+    if (req.files.videoCover) {
+      videoCover = req.files.videoCover[0].filename
+    }
+    if (req.files.videoResource) {
+      videoResource = req.files.videoResource[0].filename
+    }
+  }
+
+  await db.Video.update({...req.body, videoCover, videoResource}, {where: {id}})
+
   res.status(202).json({
     status: true,
     message: 'Video updated successfully',
-    data: video
   })
 }
 
diff --git a/api/src/helpers/filehelpers.js b/api/src/helpers/filehelpers.js
index 2305758df..440b83085 100644
--- a/api/src/helpers/filehelpers.js
+++ b/api/src/helpers/filehelpers.js
@@ -53,38 +53,42 @@ const resizeImage = (req, res, next) => {
   const { format, height, width } = { format: 'webp', ...req.body }
   try {
     // user might not send image sometimes
-    if (!req.file) return next()
+    if (!req.file) {
+      return next()
 
-    const filename = path
-      .basename(req.file.path)
-      .split('.')
-      .slice(0, -1)
-      .join('.')
-    let dir = path.join(
-      path.dirname(__dirname),
-      '..',
-      'files',
-      `${req.file.fieldname}`,
-      filename
-    )
-    let newImage = sharp(req.file.path)
-    if (width) {
-      newImage = newImage.resize(parseInt(width))
-      dir = dir + '-' + width + 'x' + height
     }
-    if (req.body.render) {
-      newImage.toBuffer().then((data) => {
-        // To display the image
-        res.writeHead(200, {
-          'Content-Type': 'image/webp',
-          'Content-Length': data.length
+    else {
+      const filename = path
+        .basename(req.file.path)
+        .split('.')
+        .slice(0, -1)
+        .join('.')
+      let dir = path.join(
+        path.dirname(__dirname),
+        '..',
+        'files',
+        `${req.file.fieldname}`,
+        filename
+      )
+      let newImage = sharp(req.file.path)
+      if (width) {
+        newImage = newImage.resize(parseInt(width))
+        dir = dir + '-' + width + 'x' + height
+      }
+      if (req.body.render) {
+        newImage.toBuffer().then((data) => {
+          // To display the image
+          res.writeHead(200, {
+            'Content-Type': 'image/webp',
+            'Content-Length': data.length
+          })
+          return res.end(data)
         })
-        return res.end(data)
-      })
-    } else {
-      const savePath = dir + '.' + format
-      newImage = newImage.toFile(savePath)
-      return next(null, true)
+      } else {
+        const savePath = dir + '.' + format
+        newImage = newImage.toFile(savePath)
+        return next(null, true)
+      }
     }
   } catch (error) {
     throw error
diff --git a/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js b/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js
new file mode 100644
index 000000000..1b1e5aaf9
--- /dev/null
+++ b/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js
@@ -0,0 +1,33 @@
+'use strict'
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('photos', 'newsId', {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'news',
+        key: 'id'
+      }
+    })
+    await queryInterface.addColumn('videos', 'newsId', {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'news',
+        key: 'id'
+      }
+    })
+    await queryInterface.addColumn('texts', 'newsId', {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'news',
+        key: 'id'
+      }
+    })
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.removeColumn('photos', 'newsId')
+    await queryInterface.removeColumn('videos', 'newsId')
+    await queryInterface.removeColumn('texts', 'newsId')
+  }
+}
diff --git a/api/src/models/newsModel.js b/api/src/models/newsModel.js
index 16ab72926..8d401df14 100644
--- a/api/src/models/newsModel.js
+++ b/api/src/models/newsModel.js
@@ -53,6 +53,9 @@ module.exports = (sequelize, DataTypes) => {
   // association
   News.associate = (models) => {
     News.belongsTo(models.Community, { foreignKey: 'communityId' })
+    News.hasMany(models.Video, { foreignKey: 'newsId' })
+    News.hasMany(models.Text, { foreignKey: 'newsId' })
+    News.hasMany(models.Photo, { foreignKey: 'newsId' })
   }
   return News
 }
diff --git a/api/src/models/photoModel.js b/api/src/models/photoModel.js
index 3d0fadce1..9fe964df9 100644
--- a/api/src/models/photoModel.js
+++ b/api/src/models/photoModel.js
@@ -14,6 +14,9 @@ module.exports = (sequelize, DataTypes) => {
     isImgDesc: {
       type: DataTypes.BOOLEAN
     },
+    newsId: {
+      type: DataTypes.INTEGER
+    },
     createdAt: {
       type: DataTypes.DATE
     },
@@ -24,6 +27,7 @@ module.exports = (sequelize, DataTypes) => {
   { timestamps: true })
   Photo.associate = (models) => {
     Photo.belongsTo(models.Lesson, { constraints: true, foreignKey: 'lessonId' })
+    Photo.belongsTo(models.News, { constraints: true, foreignKey: 'newsId' })
   }
   return Photo
 }
diff --git a/api/src/models/textModel.js b/api/src/models/textModel.js
index ae81de3ea..7c1d831bb 100644
--- a/api/src/models/textModel.js
+++ b/api/src/models/textModel.js
@@ -13,6 +13,9 @@ module.exports = (sequelize, DataTypes) => {
       textDescription: {
         type: DataTypes.TEXT
       },
+      newsId: {
+        type: DataTypes.INTEGER
+      },
       createdAt: {
         type: DataTypes.DATE
       },
@@ -27,6 +30,10 @@ module.exports = (sequelize, DataTypes) => {
       constraints: true,
       foreignKey: 'lessonId'
     })
+    Text.belongsTo(models.News, {
+      constraints: true,
+      foreignKey: 'newsId'
+    })
   }
   return Text
 }
diff --git a/api/src/models/videoModel.js b/api/src/models/videoModel.js
index 7902736d9..6be13b684 100644
--- a/api/src/models/videoModel.js
+++ b/api/src/models/videoModel.js
@@ -20,6 +20,9 @@ module.exports = (sequelize, DataTypes) => {
     videoResource: {
       type: DataTypes.STRING
     },
+    newsId: {
+      type: DataTypes.INTEGER
+    },
     createdAt: {
       type: DataTypes.DATE
     },
@@ -30,6 +33,7 @@ module.exports = (sequelize, DataTypes) => {
   { timestamps: true })
   Video.associate = (models) => {
     Video.belongsTo(models.Lesson, { constraints: true, foreignKey: 'lessonId' })
+    Video.belongsTo(models.News, { constraints: true, foreignKey: 'newsId' })
   }
 
   return Video
diff --git a/api/src/routes/photoRouter.js b/api/src/routes/photoRouter.js
index 1f7251346..dd4461dc8 100644
--- a/api/src/routes/photoRouter.js
+++ b/api/src/routes/photoRouter.js
@@ -12,7 +12,7 @@ const {
 } = require('../controllers/photoController')
 
 router.route('/').get(getPhotos)
-router.route('/add').post(upload.single('lessonImg'), resizeImage, addphoto)
-router.route('/:id').get(getPhotoById).delete(deletePhoto).put(updatePhoto)
+router.route('/add').post(upload.single('img'), resizeImage, addphoto)
+router.route('/:id').get(getPhotoById).delete(deletePhoto).put(upload.single('img'), resizeImage, updatePhoto)
 
 module.exports = router
diff --git a/api/src/routes/videoRouter.js b/api/src/routes/videoRouter.js
index e4eff0837..7bca6b4f7 100644
--- a/api/src/routes/videoRouter.js
+++ b/api/src/routes/videoRouter.js
@@ -13,8 +13,13 @@ const {
 
 // get image file middleware
 const fileChanger = (req, _res, next) => {
-  req.file = req.files.videoCover[0]
-  next()
+  if(req.files.videoCover === undefined) {
+    req.file = ''
+    next()
+  } else {
+    req.file = req.files.videoCover[0]
+    next()
+  }
 }
 
 router.route('/').get(getVideos)
@@ -26,6 +31,10 @@ router
     resizeImage,
     addVideo
   )
-router.route('/:id').get(getVideosById).delete(deleteVideo).put(updateVideo)
+router.route('/:id').get(getVideosById).delete(deleteVideo).put( 
+    upload.fields([{ name: 'videoCover' }, { name: 'videoResource' }]),
+    fileChanger,
+    resizeImage,
+    updateVideo)
 
 module.exports = router
diff --git a/api/src/server.js b/api/src/server.js
index c4ae43f28..6730477a1 100644
--- a/api/src/server.js
+++ b/api/src/server.js
@@ -56,8 +56,8 @@ app.use('/api/groups-users', groupUsersRoutes)
 app.use('/api/enterprises-users', enterpriseUsersRoutes)
 app.use('/api/resizer', resizerRoutes)
 app.use('/api/videos', videoRouter)
-app.use('/api/lesson-photos', photoRouter)
-app.use('/api/lesson-text', textRouter)
+app.use('/api/photos', photoRouter)
+app.use('/api/texts', textRouter)
 app.use('/api/materials', materialRouter)
 app.use('/api/tests', testRouter)
 app.use('/api/questions', questionRouter)
diff --git a/src/App.jsx b/src/App.jsx
index 632f307fc..98cebccd5 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -74,8 +74,9 @@ function App () {
             <PrivateRoute component={Messenger} exact path='/messenger' />
             <PrivateRoute component={MobileMessage} path='/messenger/:id' exact />
             <PrivateRoute component={CommunityPagenews} exact path='/community-page-news/:id' />
-            <PrivateRoute component={NewsAdd} path='/community-page-news/:title/:category' exact />
-            <PrivateRoute component={CommunityNewsViewPage} path='/community-page-news-view' exact />
+            <PrivateRoute component={NewsAdd} path='/community-news/:title' exact />
+            <PrivateRoute component={NewsAdd} path='/community-news/edit/:id' exact />
+            <PrivateRoute component={CommunityNewsViewPage} path='/community-news-view-page/:id' exact />
             <PrivateRoute component={AllCommunitiesCard} path='/community-switching' exact />
             <PrivateRoute component={CommunityMembers} path='/community-members/:id' exact />
             <PrivateRoute component={CommunityMembersProfile} path='/community-members-profile/:id' exact />
diff --git a/src/actions/lessonActions.js b/src/actions/lessonActions.js
index 7ed75dd09..09daf8f50 100644
--- a/src/actions/lessonActions.js
+++ b/src/actions/lessonActions.js
@@ -49,13 +49,15 @@ export const createLesson =
         const lessonId = data?.data?.id
         for (let i = 0; i < lessonData.length; i++) {
           if (lessonData[i]?.videoLink || lessonData[i]?.videoResource) {
-            await addVideo({ lessonData: lessonData[i], lessonId, dispatch })
+            await addVideo({ data: lessonData[i], lessonId, dispatch })
           }
           if (lessonData[i]?.lessonImg) {
-            await addImage({ lessonData: lessonData[i], lessonId, dispatch })
+            console.log('hi')
+            await addImage({ data: lessonData[i], lessonId, dispatch })
           }
           if (lessonData[i]?.textHeading || lessonData[i]?.textDescription) {
-            await addText({ lessonData: lessonData[i], lessonId, dispatch })
+            console.log('hello')
+            await addText({ data: lessonData[i], lessonId, dispatch })
           }
         }
         for (let i = 0; i < material.length; i++) {
diff --git a/src/actions/newsActions.js b/src/actions/newsActions.js
index 8705a7a04..67b04b2d8 100644
--- a/src/actions/newsActions.js
+++ b/src/actions/newsActions.js
@@ -23,6 +23,9 @@ import {
 } from '../constants/newsConstants'
 
 import { logout } from './userAction'
+import { addVideo } from '../screens/courseManager/addLesson/addVideo'
+import { addImage } from '../screens/courseManager/addLesson/addImage'
+import { addText } from '../screens/courseManager/addLesson/addText'
 
 // fetching current community
 const currentCommunity = localStorage.getItem('currentCommunity')
@@ -67,18 +70,41 @@ export const searchNews = (search) => async (dispatch) => {
   }
 }
 
-export const createNews = (newNews) => async (dispatch, getState) => {
+export const createNews = (newNews, newsCover) => async (dispatch, getState) => {
   const formData = new FormData()
-  formData.append('news', newNews.file)
-  formData.append('title', newNews.title)
-  formData.append('category', newNews.category)
-  formData.append('imageDetail', newNews.imageDetail)
+  formData.append('title', newNews[0].title)
+  formData.append('category', newNews[0].category)
+  formData.append('news', newsCover)
   try {
+
+    const configFunc = () => {
+        const userdata = window.localStorage.getItem('userInfo')
+        const token = JSON.parse(userdata).token
+        const headers = { 'Content-Type': 'multipart/form-data' }
+        headers.Authorization = token && `Bearer ${token}`
+        return { headers }
+    }
+
     dispatch({ type: NEWS_CREATE_REQUEST })
     const { userLogin: { userInfo } } = getState()
     const { data } = await postApi(dispatch, `${process.env.REACT_APP_API_BASE_URL}/api/news/add/community/${currentCommunity.id}`, formData)
     dispatch({ type: NEWS_CREATE_SUCCESS, payload: data })
+    
+    const newsId = data?.data?.id
+        for (let i = 0; i < newNews.length; i++) {
+          if (newNews[i]?.videoLink || newNews[i]?.videoResource) {
+            await addVideo({ data: newNews[i], lessonId: null, newsId, dispatch })
+          }
+          if (newNews[i]?.lessonImg) {
+            await addImage({ data: newNews[i], lessonId: null, newsId, dispatch })
+          }
+          if (newNews[i]?.textHeading || newNews[i]?.textDescription) {
+            await addText({ data: newNews[i], lessonId: null, newsId, dispatch })
+          }
+        }
+      
     dispatch({ type: NEWS_CLEAR, payload: data })
+    document.location.href = `/community-page-news/${currentCommunity.slug}`
   } catch (error) {
     const message =
       error.response && error.response.data.message
@@ -130,19 +156,41 @@ export const savevideoDetail = (data) => (dispatch) => {
   })
 }
 
-export const newsUpdate = (newNews) => async (dispatch) => {
+export const newsUpdate = (news, newNews) => async (dispatch) => {
+  const formData = new FormData()
+  formData.append('title', news.title)
+  formData.append('category', news.category)
+  formData.append('news', news.newsCover)
   try {
     dispatch({ type: NEWS_UPDATE_REQUEST })
-    const { id, title, description, category, file } = newNews
+    const { id } = news
     const config = configFunc()
     const data = await axios.put(
       `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`,
-      { title, description, file, category }, config
+      formData, config
     )
+    
     dispatch({
       type: NEWS_UPDATE_SUCCESS,
       payload: data
     })
+
+    //adding new content
+        for (let i = 0; i < newNews.length; i++) {
+          if (newNews[i]?.videoLink || newNews[i]?.videoResource) {
+            await addVideo({ data: newNews[i], lessonId: null, newsId: id, dispatch })
+          }
+          if (newNews[i]?.lessonImg) {
+            await addImage({ data: newNews[i], lessonId: null, newsId: id, dispatch })
+          }
+          if (newNews[i]?.textHeading || newNews[i]?.textDescription) {
+            await addText({ data: newNews[i], lessonId: null, newsId: id, dispatch })
+          }
+        }
+
+     dispatch({ type: NEWS_CLEAR, payload: data })
+    document.location.href = `/community-page-news/${currentCommunity.slug}`
+
   } catch (error) {
     const message = error.response && error.response.data.message
       ? error.response.data.message
diff --git a/src/actions/photoActions.js b/src/actions/photoActions.js
index 34077a87d..f78ce1716 100644
--- a/src/actions/photoActions.js
+++ b/src/actions/photoActions.js
@@ -1,22 +1,32 @@
-import { ADD_LESSON_PHOTO } from '../utils/urlConstants'
+import {
+  Axios,
+  ADD_LESSON_PHOTO,
+  GET_LESSON_PHOTO
+} from '../utils/urlConstants'
 import { postApi } from '../utils/apiFunc'
 
 import {
-  LESSSON_PHOTO_CREATE_REQUEST,
-  LESSSON_PHOTO_CREATE_SUCCESS,
-  LESSSON_PHOTO_CREATE_FAIL
+  PHOTO_CREATE_REQUEST,
+  PHOTO_CREATE_SUCCESS,
+  PHOTO_CREATE_FAIL,
+  PHOTO_UPDATE_REQUEST,
+  PHOTO_UPDATE_SUCCESS,
+  PHOTO_UPDATE_FAIL,
+  PHOTO_DELETE_REQUEST,
+  PHOTO_DELETE_SUCCESS,
+  PHOTO_DELETE_FAIL
 } from '../constants/photoConstants'
 
 export const createLessonImg =
-  (lessonImg, photoDescription, isImgDesc, lessonId) => async (dispatch) => {
+  (lessonImg, photoDescription, isImgDesc, lessonId, newsId) => async (dispatch) => {
     const lessonImgData = new FormData()
-    lessonImgData.append('lessonImg', lessonImg)
+    lessonImgData.append('img', lessonImg)
     lessonImgData.append('photoDescription', photoDescription)
     lessonImgData.append('isImgDesc', isImgDesc)
-    lessonImgData.append('lessonId', lessonId)
+    newsId ? lessonImgData.append('newsId', newsId) : lessonImgData.append('lessonId', lessonId)
 
     try {
-      dispatch({ type: LESSSON_PHOTO_CREATE_REQUEST })
+      dispatch({ type: PHOTO_CREATE_REQUEST })
       const config = {
         headers: {
           'Content-Type': 'multipart/form-data'
@@ -28,10 +38,10 @@ export const createLessonImg =
         lessonImgData,
         config
       )
-      dispatch({ type: LESSSON_PHOTO_CREATE_SUCCESS, payload: data })
+      dispatch({ type: PHOTO_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
-        type: LESSSON_PHOTO_CREATE_FAIL,
+        type: PHOTO_CREATE_FAIL,
         payload:
           error.response && error.response.data.message
             ? error.response.data.message
@@ -39,3 +49,54 @@ export const createLessonImg =
       })
     }
   }
+
+export const updatePhoto =
+  (id, lessonImg, photoDescription, isImgDesc, setEditPhotoModel) =>
+    async (dispatch) => {
+      const lessonImgData = new FormData()
+
+        lessonImgData.append('img', lessonImg)
+        lessonImgData.append('photoDescription', photoDescription)
+        lessonImgData.append('isImgDesc', isImgDesc)
+
+      try {
+        dispatch({ type: PHOTO_UPDATE_REQUEST })
+        const config = {
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        }
+        const { data } = await Axios.put(
+          GET_LESSON_PHOTO + `/${id}`,
+          lessonImgData,
+          config
+        )
+        dispatch({ type: PHOTO_UPDATE_SUCCESS, payload: data })
+        setEditPhotoModel(false)
+      } catch (error) {
+        dispatch({
+          type: PHOTO_UPDATE_FAIL,
+          payload:
+          error.response && error.response.data.message
+            ? error.response.data.message
+            : error.message
+        })
+      }
+    }
+
+export const deletePhoto = (id, refetch) => async (dispatch) => {
+  try {
+    dispatch({ type: PHOTO_DELETE_REQUEST })
+    const { data } = await Axios.delete(GET_LESSON_PHOTO + `/${id}`)
+    dispatch({ type: PHOTO_DELETE_SUCCESS, payload: data })
+    refetch()
+  } catch (error) {
+    dispatch({
+      type: PHOTO_DELETE_FAIL,
+      payload:
+        error.response && error.response.data.message
+          ? error.response.data.message
+          : error.message
+    })
+  }
+}
diff --git a/src/actions/textActions.js b/src/actions/textActions.js
index e99393265..70fd3bd82 100644
--- a/src/actions/textActions.js
+++ b/src/actions/textActions.js
@@ -1,27 +1,33 @@
-import { ADD_LESSON_TEXT } from '../utils/urlConstants'
+import { Axios, GET_LESSON_TEXT, ADD_LESSON_TEXT } from '../utils/urlConstants'
 import { postApi } from '../utils/apiFunc'
 
 import {
-  LESSSON_TEXT_CREATE_REQUEST,
-  LESSSON_TEXT_CREATE_SUCCESS,
-  LESSSON_TEXT_CREATE_FAIL
+  TEXT_CREATE_REQUEST,
+  TEXT_CREATE_SUCCESS,
+  TEXT_CREATE_FAIL,
+  TEXT_UPDATE_REQUEST,
+  TEXT_UPDATE_SUCCESS,
+  TEXT_UPDATE_FAIL,
+  TEXT_DELETE_REQUEST,
+  TEXT_DELETE_SUCCESS,
+  TEXT_DELETE_FAIL
 } from '../constants/textConstants'
 
 export const createText =
-  (textHeading, textDescription, lessonId) => async (dispatch) => {
-    const textData = { textHeading, textDescription, lessonId }
+  (textHeading, textDescription, lessonId, newsId) => async (dispatch) => {
+    const textData = { textHeading, textDescription, lessonId, newsId }
 
     try {
-      dispatch({ type: LESSSON_TEXT_CREATE_REQUEST })
+      dispatch({ type: TEXT_CREATE_REQUEST })
       const { data } = await postApi(
         dispatch,
         ADD_LESSON_TEXT,
         textData
       )
-      dispatch({ type: LESSSON_TEXT_CREATE_SUCCESS, payload: data })
+      dispatch({ type: TEXT_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
-        type: LESSSON_TEXT_CREATE_FAIL,
+        type: TEXT_CREATE_FAIL,
         payload:
           error.response && error.response.data.message
             ? error.response.data.message
@@ -29,3 +35,51 @@ export const createText =
       })
     }
   }
+
+export const updateText =
+  (textId, textHeading, textDescription, setEditTextModel) =>
+    async (dispatch) => {
+      const textData = { textHeading, textDescription }
+
+      try {
+        dispatch({ type: TEXT_UPDATE_REQUEST })
+        const config = {
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }
+        const { data } = await Axios.put(
+          GET_LESSON_TEXT + `/${textId}`,
+          textData,
+          config
+        )
+        dispatch({ type: TEXT_UPDATE_SUCCESS, payload: data })
+        // refetch()
+        setEditTextModel(false)
+      } catch (error) {
+        dispatch({
+          type: TEXT_UPDATE_FAIL,
+          payload:
+          error.response && error.response.data.message
+            ? error.response.data.message
+            : error.message
+        })
+      }
+    }
+
+export const deleteText = (id, refetch) => async (dispatch) => {
+  try {
+    dispatch({ type: TEXT_DELETE_REQUEST })
+    const { data } = await Axios.delete(GET_LESSON_TEXT + `/${id}`)
+    dispatch({ type: TEXT_DELETE_SUCCESS, payload: data })
+    refetch()
+  } catch (error) {
+    dispatch({
+      type: TEXT_DELETE_FAIL,
+      payload:
+        error.response && error.response.data.message
+          ? error.response.data.message
+          : error.message
+    })
+  }
+}
diff --git a/src/actions/videoActions.js b/src/actions/videoActions.js
index 10238bfe0..a44679c7a 100644
--- a/src/actions/videoActions.js
+++ b/src/actions/videoActions.js
@@ -1,10 +1,16 @@
-import { ADD_VIDEOS } from '../utils/urlConstants'
+import { Axios, ADD_VIDEOS, GET_VIDEOS } from '../utils/urlConstants'
 import { postApi } from '../utils/apiFunc'
 
 import {
   VIDEO_CREATE_REQUEST,
   VIDEO_CREATE_SUCCESS,
-  VIDEO_CREATE_FAIL
+  VIDEO_CREATE_FAIL,
+  VIDEO_UPDATE_REQUEST,
+  VIDEO_UPDATE_SUCCESS,
+  VIDEO_UPDATE_FAIL,
+  VIDEO_DELETE_REQUEST,
+  VIDEO_DELETE_SUCCESS,
+  VIDEO_DELETE_FAIL
 } from '../constants/videoConstants'
 
 export const createVideo =
@@ -14,7 +20,8 @@ export const createVideo =
     videoDescription,
     videoLink,
     videoResource,
-    lessonId
+    lessonId,
+    newsId
   ) =>
     async (dispatch) => {
       const videoData = new FormData()
@@ -23,7 +30,7 @@ export const createVideo =
       videoData.append('videoDescription', videoDescription)
       videoData.append('videoLink', videoLink)
       videoData.append('videoResource', videoResource)
-      videoData.append('lessonId', lessonId)
+      newsId ? videoData.append('newsId', newsId) : videoData.append('lessonId', lessonId)
 
       try {
         dispatch({ type: VIDEO_CREATE_REQUEST })
@@ -44,3 +51,60 @@ export const createVideo =
         })
       }
     }
+
+export const updateVideo =
+  (
+    id,
+    videoCover,
+    videoTitle,
+    videoDescription,
+    videoLink,
+    videoResource,
+    setEditVideoModel,
+    refetch
+  ) =>
+    async (dispatch) => {
+      const videoData = new FormData()
+      videoData.append('videoCover', videoCover)
+      videoData.append('videoTitle', videoTitle)
+      videoData.append('videoDescription', videoDescription)
+      videoData.append('videoLink', videoLink)
+      videoData.append('videoResource', videoResource)
+
+      try {
+        dispatch({ type: VIDEO_UPDATE_REQUEST })
+        const config = {
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        }
+        const { data } = await Axios.put(GET_VIDEOS + `/${id}`, videoData, config)
+        dispatch({ type: VIDEO_UPDATE_SUCCESS, payload: data })
+        setEditVideoModel(false)
+      } catch (error) {
+        dispatch({
+          type: VIDEO_UPDATE_FAIL,
+          payload:
+          error.response && error.response.data.message
+            ? error.response.data.message
+            : error.message
+        })
+      }
+    }
+
+export const deleteVideo = (id, refetch) => async (dispatch) => {
+  try {
+    dispatch({ type: VIDEO_DELETE_REQUEST })
+    const { data } = await Axios.delete(GET_VIDEOS + `/${id}`)
+    dispatch({ type: VIDEO_DELETE_SUCCESS, payload: data })
+    refetch()
+  } catch (error) {
+    dispatch({
+      type: VIDEO_DELETE_FAIL,
+      payload:
+        error.response && error.response.data.message
+          ? error.response.data.message
+          : error.message
+    })
+  }
+}
diff --git a/src/components/contentAdd/ContentAdd.jsx b/src/components/contentAdd/ContentAdd.jsx
new file mode 100644
index 000000000..7d4f0813f
--- /dev/null
+++ b/src/components/contentAdd/ContentAdd.jsx
@@ -0,0 +1,42 @@
+import React from 'react'
+import Text from '../../screens/courseManager/addLesson/Text'
+import Image from '../lessonImage/Image'
+import Video from '../videoPlayer/Video'
+
+const ContentAdd = ({data, setVideoModal, setImageModal, setTextModal, textModal}) => {
+  return (
+    <>
+      {
+        data.length > 0 &&
+          data.map((vid, index) => (
+            <div key={index}>
+              <Video
+              title={vid.videoTitle}
+              description={vid.videoDescription}
+              url={vid.videoLink || vid.videoResource?.preview}
+              thumbnail={vid.videoCover?.preview}
+              />
+              <Image src={vid.lessonImg?.preview} desc={vid.photoDescription} />
+              <Text heading={vid.textHeading} desc={vid.textDescription} />
+          </div>
+        ))
+      }
+      <div className='admin-lesson-create-btn-wrapper'>
+        <button className='secondary-btn' onClick={() => setVideoModal(true)}>
+          <img src='/img/video-outline.svg' alt='video icon' />{' '}
+          <span>Add video</span>
+        </button>
+        <button className='secondary-btn' onClick={() => setImageModal(true)}>
+          <img src='/img/image-outline.svg' alt='image_icon' />
+          <span>Add image</span>
+        </button>
+        <button className='secondary-btn' onClick={() => setTextModal(true)}>
+          <img src='/img/text-outline.svg' alt='text icon' />{' '}
+          <span>Add text</span>
+        </button>
+      </div>
+    </>
+    )
+}
+
+export default ContentAdd
diff --git a/src/components/contentAdd/ContentAdd.scss b/src/components/contentAdd/ContentAdd.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/editContent/EditContent.jsx b/src/components/editContent/EditContent.jsx
new file mode 100644
index 000000000..50f2791d7
--- /dev/null
+++ b/src/components/editContent/EditContent.jsx
@@ -0,0 +1,99 @@
+import { useState, useEffect } from 'react'
+import { GET_VIDEO, VIDEO_COVER, LESSON_IMG } from '../../utils/urlConstants'
+import Text from '../../screens/courseManager/addLesson/Text'
+import Image from '../lessonImage/Image'
+import Video from '../videoPlayer/Video'
+
+const EditContent = ({
+  data,
+  newLessonData,
+  setEditTextModel,
+  setEditPhotoModel,
+  setEditVideoModel,
+  removeTextItem,
+  removePhoto,
+  removeVideo,
+  removeLocalData,
+  editImageFunc,
+  editVideoFunc,
+  editTextFunc
+}) => {
+  const [allLessonData, setAllLessonData] = useState([])
+
+  useEffect(() => {
+    setAllLessonData(data, newLessonData)
+  }, [data, newLessonData])
+
+  function video (data) {
+    if (typeof data?.videoResource === 'string') {
+      return `${GET_VIDEO}${data?.videoResource}`
+    } else {
+      return data?.videoResource?.preview
+    }
+  }
+
+  return (
+    <>{
+      data && <>
+       {
+        data?.photos && data?.photos.map(item => {
+          return  <Image
+                src={
+                  typeof item?.lessonImg === 'string'
+                    ? `${LESSON_IMG}${item?.lessonImg}`
+                    : item?.lessonImg.preview
+                }
+                id={item?.id || item?.itemId}
+                modelPopUp={editImageFunc}
+                setEditPhotoModel={setEditPhotoModel}
+                isEditable
+                desc={item?.isImgDesc === true && item?.photoDescription}
+                onRemove={item?.id ? removePhoto : removeLocalData}
+              />
+        })
+      }
+
+      {
+        data?.texts && data?.texts.map(item => {
+          return  <Text
+              heading={item?.textHeading}
+              desc={item?.textDescription}
+              isEditable
+              setEditTextModel={setEditTextModel}
+              modelPopUp={editTextFunc}
+              id={item?.id || item?.itemId}
+              onRemove={item?.id ? removeTextItem : removeLocalData}
+            />
+        })
+      }
+
+      {
+        data?.videos && data?.videos.map(item => {
+          return  <Video
+              title={item?.videoTitle}
+              description={item?.videoDescription}
+              url={
+                item?.videoLink === '' || item?.videoLink === undefined
+                  ? video(item)
+                  : item?.videoLink
+              }
+              thumbnail={
+                typeof item?.videoCover === 'string'
+                  ? `${VIDEO_COVER}${item?.videoCover}`
+                  : item?.videoCover?.preview
+              }
+              setEditVideoModel={setEditVideoModel}
+              isEditable
+              id={item?.id || item?.itemId}
+              modelPopUp={editVideoFunc}
+              onRemove={item?.id ? removeVideo : removeLocalData}
+            />
+        })
+      }
+      </>
+    }
+    </>
+  )
+}
+
+export default EditContent
diff --git a/src/components/formUI/FormUI.jsx b/src/components/formUI/FormUI.jsx
index dc3c8944d..64276f6b4 100644
--- a/src/components/formUI/FormUI.jsx
+++ b/src/components/formUI/FormUI.jsx
@@ -86,10 +86,11 @@ export const SubmitButton = (props) => {
 }
 
 export const TextArea = React.forwardRef(
-  ({ className, placeholder, name, rows, cols, onChange, disabled }, ref) => {
+  ({ className, placeholder, name, rows, cols, onChange, disabled, defaultValue }, ref) => {
     return (
       <>
         <textarea
+          defaultValue={defaultValue}
           className={className}
           placeholder={placeholder}
           cols={cols}
diff --git a/src/components/lessonImage/Image.jsx b/src/components/lessonImage/Image.jsx
index e784c51c4..e9aa24f91 100644
--- a/src/components/lessonImage/Image.jsx
+++ b/src/components/lessonImage/Image.jsx
@@ -1,12 +1,31 @@
+import Actions from '../../screens/courseManager/addLesson/Actions'
 import './Image.scss'
 
-const Image = ({ src, desc }) => {
+const Image = ({
+  src,
+  desc,
+  onRemove,
+  id,
+  modelPopUp,
+  setEditPhotoModel,
+  isEditable
+}) => {
+  const poopUp = () => {
+    modelPopUp(id)
+    setEditPhotoModel(true)
+  }
+  
   return (
     <>
       {src ? (
         <div className='imgPreview'>
           <img src={src} alt={`lesson_${src}_img`} />
           <p>{desc && `"${desc}"`}</p>
+          {isEditable ? (
+            <Actions onRemove={onRemove} id={id} poopUp={poopUp} />
+          ) : (
+            ''
+          )}
         </div>
       ) : (
         ''
diff --git a/src/components/lessonImage/Image.scss b/src/components/lessonImage/Image.scss
index e5b06da4b..1131c5094 100644
--- a/src/components/lessonImage/Image.scss
+++ b/src/components/lessonImage/Image.scss
@@ -4,6 +4,8 @@
   align-items: center;
   flex-direction: column;
   margin: 2em 0;
+  position: relative;
+  color: var(--primary-white);
 
   img {
     width: 100%;
@@ -13,4 +15,12 @@
     font-size: 1em;
     font-style: italic;
   }
+  .actions {
+    position: absolute;
+    z-index: 5;
+    top: 1%;
+    right: 1%;
+    background: var(--background-color-image);
+    border-radius: 4px;
+  }
 }
diff --git a/src/components/newAddModal/NewsAddModal.jsx b/src/components/newAddModal/NewsAddModal.jsx
index c81e0b48d..24575aac0 100644
--- a/src/components/newAddModal/NewsAddModal.jsx
+++ b/src/components/newAddModal/NewsAddModal.jsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import './NewsAddModal.scss'
-import { Link } from 'react-router-dom'
+import { Link, useHistory } from 'react-router-dom'
 import { useDispatch } from 'react-redux'
 import { newsUpdate } from '../../actions/newsActions'
 
@@ -11,6 +11,8 @@ const NewsAddModal = ({ setAddModal, editData, setEditData }) => {
   const [titleError, setTitleError] = useState()
   const [categoryError, setCategoryError] = useState()
 
+  const history = useHistory();
+
   const dispatch = useDispatch()
   const titleChange = (e) => {
     setTitle(e.target.value)
@@ -50,11 +52,16 @@ const NewsAddModal = ({ setAddModal, editData, setEditData }) => {
             <option>Business</option>
           </select>
         </div>
-        {editData
+        {
+          editData
           ? <button className='default-btn-btn btn-variation' onClick={editNewsTitle}>Update</button>
-          : <Link className='nav-link' to={`/community-page-news/${title}/${category}`}>
-            <button className='default-btn-btn btn-variation'>Continue</button>
-          </Link>}
+          : <button className='default-btn-btn btn-variation' onClick = {() => history.push({
+              pathname: `/community-news/${title}`,
+              state: {
+                category
+              }
+            })}>Continue</button>
+        }
       </div>
     </div>
   )
diff --git a/src/components/newsCard/NewsCard.jsx b/src/components/newsCard/NewsCard.jsx
index adffd07d0..24357fc5d 100644
--- a/src/components/newsCard/NewsCard.jsx
+++ b/src/components/newsCard/NewsCard.jsx
@@ -6,26 +6,21 @@ import { deleteNews } from '../../actions/newsActions'
 import Background from '../background/Background'
 import { useState } from 'react'
 
-function NewsCard ({ news, editCard }) {
+function NewsCard ({ news, editCard, deleteNewsCard }) {
   return (
     <>
       {news && news.map((news) => {
         return (
-          <NewsSingleCard news={news} editCard={editCard} />
+          <NewsSingleCard news={news} editCard={editCard} deleteNewsCard={deleteNewsCard} />
         )
       })}
     </>
   )
 }
 
-const NewsSingleCard = ({ news, editCard }) => {
+const NewsSingleCard = ({ news, editCard, deleteNewsCard }) => {
   const [dropDown, setDropDown] = useState(false)
-  const dispatch = useDispatch()
-
-  const deleteNewsCard = (id) => {
-    dispatch(deleteNews(id))
-    setDropDown(false)
-  }
+  
   const editNewsCard = (id) => {
     editCard(id)
     setDropDown(false)
@@ -53,7 +48,7 @@ const NewsSingleCard = ({ news, editCard }) => {
             </div>
           </div>
         </div>
-        <Link to={{ pathname: '/community-page-news-view', state: { news } }}>
+        <Link to={{ pathname: `/community-news-view-page/${news.id}`, state: { news } }}>
           <div key={news.id}>
             <div className='newsCard-group'>
               <div className='frame-text'>
diff --git a/src/components/newsCreateModal/NewsCreateImage.jsx b/src/components/newsCreateModal/NewsCreateImage.jsx
index 8859a71f2..5c9f3ef21 100644
--- a/src/components/newsCreateModal/NewsCreateImage.jsx
+++ b/src/components/newsCreateModal/NewsCreateImage.jsx
@@ -8,12 +8,16 @@ import { TextArea } from '../formUI/FormUI'
 
 import './NewsCreateModal.scss'
 import ToggleSwitch from '../toggleSwitch/ToggleSwitch'
+import { LESSON_IMG } from '../../utils/urlConstants'
+import { useEffect } from 'react'
 
 const CreateImage = ({
   imageActive,
   setImageActive,
   lessonData,
-  setLessonData
+  setLessonData,
+  data = [],
+  editFunc
 }) => {
   const [isImgDesc, setIsImgDesc] = useState(true)
   const [lessonImg, setLessonImg] = useState(null)
@@ -32,6 +36,24 @@ const CreateImage = ({
     setLessonData(imgData)
     setImageActive(false)
   }
+
+  const editNewsImg = ({ photoDescription }) => {
+    const imgData = [
+      ...lessonData,
+      {
+        lessonImg,
+        photoDescription,
+        isImgDesc
+      }
+    ]
+    editFunc({id: data[0].id, lessonImg, photoDescription, isImgDesc})
+  }
+
+  useEffect(() => {
+    if(data.length > 0) {
+      setIsImgDesc(data[0].isImgDesc)
+    }
+  }, [])
   return (
     <>
       {imageActive && (
@@ -46,6 +68,8 @@ const CreateImage = ({
                 onChange={(img) => setLessonImg(img)}
                 fileType='image/png,image/jpeg,image/jpg'
                 text='Drag & Drop photo in this area or Click Here to attach'
+                dataImg={data.length > 0 && `${LESSON_IMG}${data[0].lessonImg}`}
+                onClick={() => setLessonImg(null)}
               />
               <div className='description'>
                 <label>Add photo description ?</label>{' '}
@@ -57,6 +81,7 @@ const CreateImage = ({
               {isImgDesc && (
                 <div className='photo-input-container'>
                   <TextArea
+                    defaultValue={data.length > 0 ? data[0].photoDescription : ''}
                     placeholder='Photo Description (Optional)'
                     className='default-input-variation text-area-variation textarea'
                     cols='3'
@@ -67,11 +92,17 @@ const CreateImage = ({
                 </div>
               )}
 
-              <Button
-                name='Add Photo Block'
-                onClick={handleSubmit(submitLessonImg)}
-                className='add'
-              />
+              {
+                data.length > 0 
+                ? <Button
+                    className='add'
+                    name='Edit Photo Block'
+                    onClick={handleSubmit(editNewsImg)} />
+                : <Button
+                    className='add'
+                    name='Add Photo Block'
+                    onClick={handleSubmit(submitLessonImg)} />
+              }
             </div>
           </div>
         </div>
diff --git a/src/components/newsCreateModal/NewsCreateModal.jsx b/src/components/newsCreateModal/NewsCreateModal.jsx
index ab9a92149..b0a04d25d 100644
--- a/src/components/newsCreateModal/NewsCreateModal.jsx
+++ b/src/components/newsCreateModal/NewsCreateModal.jsx
@@ -22,10 +22,15 @@ const NewsCreateModal = ({
   setGroupEditActive,
   addVideoData,
   lessonData,
-  setLessonData
+  setLessonData,
+  imageData = [],
+  textData = [],
+  videoData = [],
+  editTextConfirm,
+  editImageConfirm,
+  editVideoConfirm
 }) => {
   const [files, setFiles] = useState(null)
-
   switch (type) {
     case 'video':
       return (
@@ -37,6 +42,8 @@ const NewsCreateModal = ({
           setVideoActive={setVideoActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
+          data={videoData || []}
+          editFunc={editVideoConfirm}
         />
       )
 
@@ -68,6 +75,8 @@ const NewsCreateModal = ({
           setImageActive={setImageActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
+          data={imageData || []}
+          editFunc={editImageConfirm}
         />
       )
 
@@ -79,6 +88,8 @@ const NewsCreateModal = ({
           setTextActive={setTextActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
+          data={textData || []}
+          editFunc={editTextConfirm}
         />
       )
 
diff --git a/src/components/newsCreateModal/NewsCreateModal.scss b/src/components/newsCreateModal/NewsCreateModal.scss
index c02af3aaf..3b1744aa2 100644
--- a/src/components/newsCreateModal/NewsCreateModal.scss
+++ b/src/components/newsCreateModal/NewsCreateModal.scss
@@ -54,6 +54,7 @@
 .last-input-variation {
   width: 45%;
 }
+
 .full {
   width: 100% !important;
 }
@@ -87,13 +88,16 @@
   font-size: 11px;
   width: 50%;
 }
+
 .errorMsg {
   color: var(--secondary-red);
   margin: 0.5em 0 1em 0;
   font-size: 1em;
 }
+
 .error {
   border-color: var(--secondary-red);
+
   &:focus {
     border-color: var(--secondary-red) !important;
   }
@@ -107,7 +111,6 @@
   padding: 1.4em 1em;
   border: 0.5px solid var(--primary-white);
   background: var(--background-color-light);
-  outline: none;
   cursor: pointer;
   position: relative;
 
@@ -119,14 +122,17 @@
   img.avatar {
     display: none;
   }
+
   img.drag-drop-close {
     right: 0;
     top: 0;
   }
+
   .videoName {
     color: #fff;
     z-index: 1;
   }
+
   .drag-drop-icon-container {
     width: 100%;
     height: 100%;
@@ -151,6 +157,7 @@
     }
   }
 }
+
 .videoUploadBtn::-webkit-file-upload-button {
   display: none;
 }
@@ -160,6 +167,7 @@
     flex-wrap: wrap;
     text-align: center;
   }
+
   .video-row-3 > input,
   span {
     width: 100% !important;
@@ -184,7 +192,7 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      background-color: var(--primary-black);
+      background-color: var(--cards);
       border-radius: 0.4em;
 
       @media (max-width: 768px) {
@@ -195,18 +203,22 @@
         .toggle-container {
           background: var(--cards);
         }
+
         .active + .toggle-container {
           background: var(--primary-color);
         }
       }
+
       .input-container {
         .block {
-          border: 1px solid var(--primary-grey);
-          background-color: var(--popups);
+          border: 1px solid var(--dropdowns);
+          background-color: var(--cards);
+
           .label {
             width: 100%;
             margin-left: 2.5em;
           }
+
           .inputField {
             padding: 1.2em 0;
             color: #fff;
@@ -217,31 +229,34 @@
           }
         }
       }
+
       .textarea {
         margin-bottom: 1.5em;
-        border: 1px solid var(--primary-grey);
+        border: 1px solid var(--dropdowns);
         outline: none;
-        background-color: var(--popups);
+        background-color: var(--cards);
         color: #ffff;
         font-size: 1.05em;
         font-family: inherit;
 
         &__error {
           border-color: var(--secondary-red);
+
           &:focus {
             border-color: var(--secondary-red) !important;
           }
         }
 
-        &:focus {
-          border-color: var(--primary-color);
-        }
-
         &::-webkit-input-placeholder {
           color: var(--primary-grey);
         }
+
+        &:focus {
+          border-color: var(--primary-color);
+        }
       }
     }
+
     .drag-drop-container {
       width: 100%;
       height: 15em;
@@ -252,6 +267,7 @@
       position: relative;
       overflow: hidden;
     }
+
     .drag-drop {
       height: 100%;
       border: none;
@@ -280,11 +296,12 @@
         margin-bottom: 1.5em;
       }
     }
+
     .video-row-3 {
       input {
-        border: 1px solid var(--primary-grey);
+        border: 1px solid var(--dropdowns);
         outline: none;
-        background-color: var(--popups);
+        background-color: var(--cards);
         color: #ffff;
         font-size: 1.05em;
         font-family: inherit;
@@ -302,14 +319,17 @@
           margin: 0;
         }
       }
+
       .dragDropText {
         color: #ffff;
         height: auto;
       }
+
       @media (max-width: 768px) {
         span {
           margin: 0.8em 0;
         }
+
         .videoUploadBtn {
           width: 100% !important;
 
@@ -320,6 +340,7 @@
       }
     }
   }
+
   &__text {
     .input-container {
       margin-bottom: 1.5em;
diff --git a/src/components/newsCreateModal/NewsCreateVideo.jsx b/src/components/newsCreateModal/NewsCreateVideo.jsx
index 3ebe27dc9..e3ac7b325 100644
--- a/src/components/newsCreateModal/NewsCreateVideo.jsx
+++ b/src/components/newsCreateModal/NewsCreateVideo.jsx
@@ -6,6 +6,7 @@ import DragDrop from '../dragDrop/DragDrop'
 import CollectionModalHeader from './CollectionModalHeader'
 import { InputFields, ErrorText, TextArea } from '../formUI/FormUI'
 import './NewsCreateModal.scss'
+import { LESSON_IMG, VIDEO_COVER } from '../../utils/urlConstants'
 
 const CreateVideo = ({
   getRootProps,
@@ -14,7 +15,9 @@ const CreateVideo = ({
   videoActive,
   setVideoActive,
   lessonData,
-  setLessonData
+  setLessonData,
+  data = [],
+  editFunc
 }) => {
   const { register, errors, handleSubmit } = useForm()
   const [videoCover, setVideoCover] = useState(null)
@@ -36,6 +39,22 @@ const CreateVideo = ({
     setLessonData(vData)
     setVideoActive(false)
   }
+
+    const editVideo = ({ videoTitle, videoDescription, videoLink }) => {
+    const videoResource = video
+    const vData = [
+      ...lessonData,
+      {
+        videoCover,
+        videoTitle,
+        videoDescription,
+        videoLink,
+        videoResource
+      }
+    ]
+    editFunc({id: data[0].id, videoTitle, videoDescription, videoLink, videoResource, videoCover : videoCover || 'videoCover'})
+  }
+
   return (
     <>
       {videoActive && (
@@ -51,7 +70,9 @@ const CreateVideo = ({
                 getRootProps={getRootProps}
                 files={files}
                 text='Drag & Drop photo in this area or Click Here to attach Video Cover'
+                dataImg={data.length > 0 && `${VIDEO_COVER}${data[0]?.videoCover}`}
                 onChange={(img) => setVideoCover(img)}
+                onClick={() => setVideoCover(null)}
                 fileType='image/png,image/jpeg,image/jpg'
               />
               <div className='video-input-container'>
@@ -60,6 +81,7 @@ const CreateVideo = ({
                   placeholder='Video Title (Optional)'
                   name='videoTitle'
                   ref={register}
+                  defaultValue={data.length > 0 ? data[0].videoTitle : ''}
                 />
 
                 <TextArea
@@ -69,6 +91,7 @@ const CreateVideo = ({
                   rows='4'
                   name='videoDescription'
                   ref={register}
+                  defaultValue={data.length > 0 ? data[0].videoDescription : ''}
                 />
                 <div className='video-row-3'>
                   {!video && (
@@ -84,6 +107,7 @@ const CreateVideo = ({
                         }
                         placeholder='Video Link'
                         name='videoLink'
+                        defaultValue={data.length > 0 ? data[0].videoLink : ""}
                         ref={register({
                           required: {
                             value: true,
@@ -116,11 +140,17 @@ const CreateVideo = ({
                   message={errors.videoLink && errors.videoLink.message}
                 />
               </div>
-              <Button
-                className='add'
-                name='Add Video Block'
-                onClick={handleSubmit(addVideo)}
-              />
+              {
+                data.length > 0 
+                ? <Button
+                    className='add'
+                    name='Edit Video Block'
+                    onClick={handleSubmit(editVideo)} />
+                : <Button
+                    className='add'
+                    name='Add Video Block'
+                    onClick={handleSubmit(addVideo)} />
+              }
             </div>
           </div>
         </div>
diff --git a/src/components/newsCreateModal/NewsTextModel.jsx b/src/components/newsCreateModal/NewsTextModel.jsx
index 522c259f8..9062fa812 100644
--- a/src/components/newsCreateModal/NewsTextModel.jsx
+++ b/src/components/newsCreateModal/NewsTextModel.jsx
@@ -9,7 +9,9 @@ const CreateText = ({
   textActive,
   setTextActive,
   lessonData,
-  setLessonData
+  setLessonData,
+  data,
+  editFunc
 }) => {
   const { register, errors, handleSubmit } = useForm()
 
@@ -26,6 +28,13 @@ const CreateText = ({
     }
     setTextActive(false)
   }
+
+  const editText = ({textHeading, textDescription}) => {
+    if (textHeading.length !== 0 || textDescription.length !== 0) {
+    editFunc({textHeading, textDescription, id: data[0].id})
+    }
+  }
+  
   return (
     <>
       {textActive && (
@@ -43,6 +52,7 @@ const CreateText = ({
                   placeholder='Text Heading (Optional)'
                   name='textHeading'
                   ref={register}
+                  defaultValue={data.length > 0 ? data[0].textHeading : ''}
                 />
                 <TextArea
                   className={`default-input-variation text-area-variation ${
@@ -54,6 +64,7 @@ const CreateText = ({
                   cols='3'
                   rows='7'
                   name='textDescription'
+                  defaultValue={data.length > 0 ? data[0].textDescription : ''}
                   ref={register({
                     required: {
                       value: true,
@@ -68,11 +79,18 @@ const CreateText = ({
                   }
                 />
               </div>
-              <Button
-                className='add'
-                name='Add Text Block'
-                onClick={handleSubmit(addText)}
-              />
+              
+              {
+                data.length > 0 
+                ? <Button
+                    className='add'
+                    name='Edit Text Block'
+                    onClick={handleSubmit(editText)} />
+                : <Button
+                    className='add'
+                    name='Add Text Block'
+                    onClick={handleSubmit(addText)} />
+              }
             </div>
           </div>
         </div>
diff --git a/src/components/videoPlayer/Video.jsx b/src/components/videoPlayer/Video.jsx
index 8d7f858ef..c75b8c495 100644
--- a/src/components/videoPlayer/Video.jsx
+++ b/src/components/videoPlayer/Video.jsx
@@ -1,11 +1,28 @@
 import { useState } from 'react'
 import ReactPlayer from 'react-player'
+
+import Actions from '../../screens/courseManager/addLesson/Actions'
 import { ReactComponent as Play } from '../../assets/images/play.svg'
 import { ReactComponent as BookMark } from '../../assets/images/book-outlined.svg'
 import './Video.scss'
 
-const Video = ({ title, description, url, thumbnail }) => {
+const Video = ({
+  title,
+  description,
+  url,
+  thumbnail,
+  itemId,
+  isEditable,
+  onRemove,
+  id,
+  setEditVideoModel,
+  modelPopUp
+}) => {
   const [showInfo, setShowInfo] = useState(false)
+  const poopUp = () => {
+    modelPopUp(id)
+    setEditVideoModel(true)
+  }
   return (
     <>
       {url ? (
@@ -13,10 +30,15 @@ const Video = ({ title, description, url, thumbnail }) => {
           <div className={showInfo ? 'info hide' : 'info'}>
             <h1 className='videoTitle'>{title}</h1>
             <p className='videoDesc'>{description}</p>
+            <p className='videoDesc'>{itemId}</p>
           </div>
-          <div className='addToLibrary'>
-            <BookMark />
-          </div>
+          {isEditable ? (
+            <Actions onRemove={onRemove} id={id} poopUp={poopUp} />
+          ) : (
+            <div className='addToLibrary'>
+              <BookMark />
+            </div>
+          )}
 
           <ReactPlayer
             className='video'
@@ -38,3 +60,4 @@ const Video = ({ title, description, url, thumbnail }) => {
 }
 
 export default Video
+
diff --git a/src/components/videoPlayer/Video.scss b/src/components/videoPlayer/Video.scss
index bef19509b..bc5eb3192 100644
--- a/src/components/videoPlayer/Video.scss
+++ b/src/components/videoPlayer/Video.scss
@@ -18,6 +18,7 @@
     justify-content: flex-start;
     align-items: flex-start;
     z-index: 1;
+    color: var(--primary-white);
 
     @media (max-width: 778px) {
       width: 80%;
@@ -109,6 +110,13 @@
       }
     }
   }
+  .actions {
+    position: absolute;
+    z-index: 5;
+    top: 1%;
+    right: 1%;
+    background: var(--background-color-image);
+  }
 }
 .react-player__preview::before {
   content: '';
diff --git a/src/constants/photoConstants.js b/src/constants/photoConstants.js
index 13457b512..a283782f5 100644
--- a/src/constants/photoConstants.js
+++ b/src/constants/photoConstants.js
@@ -1,16 +1,16 @@
-export const LESSSON_PHOTO_LIST_REQUEST = 'LESSSON_PHOTO_LIST_REQUEST'
-export const LESSSON_PHOTO_LIST_SUCCESS = 'LESSSON_PHOTO_LIST_SUCCESS'
-export const LESSSON_PHOTO_LIST_FAIL = 'LESSSON_PHOTO_LIST_FAIL'
+export const PHOTO_LIST_REQUEST = 'PHOTO_LIST_REQUEST'
+export const PHOTO_LIST_SUCCESS = 'PHOTO_LIST_SUCCESS'
+export const PHOTO_LIST_FAIL = 'PHOTO_LIST_FAIL'
 
-export const LESSSON_PHOTO_CREATE_REQUEST = 'LESSSON_PHOTO_CREATE_REQUEST'
-export const LESSSON_PHOTO_CREATE_SUCCESS = 'LESSSON_PHOTO_CREATE_SUCCESS'
-export const LESSSON_PHOTO_CREATE_FAIL = 'LESSSON_PHOTO_CREATE_FAIL'
-export const LESSSON_PHOTO_CREATE_RESET = 'LESSSON_PHOTO_CREATE_RESET'
+export const PHOTO_CREATE_REQUEST = 'PHOTO_CREATE_REQUEST'
+export const PHOTO_CREATE_SUCCESS = 'PHOTO_CREATE_SUCCESS'
+export const PHOTO_CREATE_FAIL = 'PHOTO_CREATE_FAIL'
+export const PHOTO_CREATE_RESET = 'PHOTO_CREATE_RESET'
 
-export const LESSSON_PHOTO_UPDATE_REQUEST = 'LESSSON_PHOTO_UPDATE_REQUEST'
-export const LESSSON_PHOTO_UPDATE_SUCCESS = 'LESSSON_PHOTO_UPDATE_SUCCESS'
-export const LESSSON_PHOTO_UPDATE_FAIL = 'LESSSON_PHOTO_UPDATE_FAIL'
+export const PHOTO_UPDATE_REQUEST = 'PHOTO_UPDATE_REQUEST'
+export const PHOTO_UPDATE_SUCCESS = 'PHOTO_UPDATE_SUCCESS'
+export const PHOTO_UPDATE_FAIL = 'PHOTO_UPDATE_FAIL'
 
-export const LESSSON_PHOTO_DELETE_REQUEST = 'LESSSON_PHOTO_DELETE_REQUEST'
-export const LESSSON_PHOTO_DELETE_SUCCESS = 'LESSSON_PHOTO_DELETE_SUCCESS'
-export const LESSSON_PHOTO_DELETE_FAIL = 'LESSSON_PHOTO_DELETE_FAIL'
+export const PHOTO_DELETE_REQUEST = 'PHOTO_DELETE_REQUEST'
+export const PHOTO_DELETE_SUCCESS = 'PHOTO_DELETE_SUCCESS'
+export const PHOTO_DELETE_FAIL = 'PHOTO_DELETE_FAIL'
diff --git a/src/constants/textConstants.js b/src/constants/textConstants.js
index b55965562..7899693e4 100644
--- a/src/constants/textConstants.js
+++ b/src/constants/textConstants.js
@@ -1,16 +1,16 @@
-export const LESSSON_TEXT_LIST_REQUEST = 'LESSSON_TEXT_LIST_REQUEST'
-export const LESSSON_TEXT_LIST_SUCCESS = 'LESSSON_TEXT_LIST_SUCCESS'
-export const LESSSON_TEXT_LIST_FAIL = 'LESSSON_TEXT_LIST_FAIL'
+export const LESSSON_TEXT_LIST_REQUEST = 'TEXT_LIST_REQUEST'
+export const TEXT_LIST_SUCCESS = 'TEXT_LIST_SUCCESS'
+export const TEXT_LIST_FAIL = 'TEXT_LIST_FAIL'
 
-export const LESSSON_TEXT_CREATE_REQUEST = 'LESSSON_TEXT_CREATE_REQUEST'
-export const LESSSON_TEXT_CREATE_SUCCESS = 'LESSSON_TEXT_CREATE_SUCCESS'
-export const LESSSON_TEXT_CREATE_FAIL = 'LESSSON_TEXT_CREATE_FAIL'
-export const LESSSON_TEXT_CREATE_RESET = 'LESSSON_TEXT_CREATE_RESET'
+export const TEXT_CREATE_REQUEST = 'TEXT_CREATE_REQUEST'
+export const TEXT_CREATE_SUCCESS = 'TEXT_CREATE_SUCCESS'
+export const TEXT_CREATE_FAIL = 'TEXT_CREATE_FAIL'
+export const TEXT_CREATE_RESET = 'TEXT_CREATE_RESET'
 
-export const LESSSON_TEXT_UPDATE_REQUEST = 'LESSSON_TEXT_UPDATE_REQUEST'
-export const LESSSON_TEXT_UPDATE_SUCCESS = 'LESSSON_TEXT_UPDATE_SUCCESS'
-export const LESSSON_TEXT_UPDATE_FAIL = 'LESSSON_TEXT_UPDATE_FAIL'
+export const TEXT_UPDATE_REQUEST = 'TEXT_UPDATE_REQUEST'
+export const TEXT_UPDATE_SUCCESS = 'TEXT_UPDATE_SUCCESS'
+export const TEXT_UPDATE_FAIL = 'TEXT_UPDATE_FAIL'
 
-export const LESSSON_TEXT_DELETE_REQUEST = 'LESSSON_TEXT_DELETE_REQUEST'
-export const LESSSON_TEXT_DELETE_SUCCESS = 'LESSSON_TEXT_DELETE_SUCCESS'
-export const LESSSON_TEXT_DELETE_FAIL = 'LESSSON_TEXT_DELETE_FAIL'
+export const TEXT_DELETE_REQUEST = 'TEXT_DELETE_REQUEST'
+export const TEXT_DELETE_SUCCESS = 'TEXT_DELETE_SUCCESS'
+export const TEXT_DELETE_FAIL = 'TEXT_DELETE_FAIL'
diff --git a/src/reducers/photoReducer.js b/src/reducers/photoReducer.js
index 92adc8b84..d237621ea 100644
--- a/src/reducers/photoReducer.js
+++ b/src/reducers/photoReducer.js
@@ -1,21 +1,53 @@
 import {
-  LESSSON_PHOTO_CREATE_REQUEST,
-  LESSSON_PHOTO_CREATE_SUCCESS,
-  LESSSON_PHOTO_CREATE_FAIL,
-  LESSSON_PHOTO_CREATE_RESET
+  PHOTO_CREATE_REQUEST,
+  PHOTO_CREATE_SUCCESS,
+  PHOTO_CREATE_FAIL,
+  PHOTO_CREATE_RESET,
+  PHOTO_UPDATE_REQUEST,
+  PHOTO_UPDATE_SUCCESS,
+  PHOTO_UPDATE_FAIL,
+  PHOTO_DELETE_REQUEST,
+  PHOTO_DELETE_SUCCESS,
+  PHOTO_DELETE_FAIL
 } from '../constants/photoConstants'
 
 export const photoCreateReducer = (state = {}, action) => {
   switch (action.type) {
-    case LESSSON_PHOTO_CREATE_REQUEST:
+    case PHOTO_CREATE_REQUEST:
       return { loading: true }
-    case LESSSON_PHOTO_CREATE_SUCCESS:
+    case PHOTO_CREATE_SUCCESS:
       return { loading: false, success: true, course: action.payload }
-    case LESSSON_PHOTO_CREATE_FAIL:
+    case PHOTO_CREATE_FAIL:
       return { loading: false, error: action.payload }
-    case LESSSON_PHOTO_CREATE_RESET:
+    case PHOTO_CREATE_RESET:
       return {}
     default:
       return state
   }
 }
+
+export const photoUpdateReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case PHOTO_UPDATE_REQUEST:
+      return { loading: true }
+    case PHOTO_UPDATE_SUCCESS:
+      return { loading: false, success: true}
+    case PHOTO_UPDATE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
+
+export const photoDeleteReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case PHOTO_DELETE_REQUEST:
+      return { loading: true }
+    case PHOTO_DELETE_SUCCESS:
+      return { loading: false, success: true}
+    case PHOTO_DELETE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/reducers/textReducer.js b/src/reducers/textReducer.js
index a25bb0157..46f1469e9 100644
--- a/src/reducers/textReducer.js
+++ b/src/reducers/textReducer.js
@@ -1,21 +1,53 @@
 import {
-  LESSSON_TEXT_CREATE_REQUEST,
-  LESSSON_TEXT_CREATE_SUCCESS,
-  LESSSON_TEXT_CREATE_FAIL,
-  LESSSON_TEXT_CREATE_RESET
+  TEXT_CREATE_REQUEST,
+  TEXT_CREATE_SUCCESS,
+  TEXT_CREATE_FAIL,
+  TEXT_CREATE_RESET,
+  TEXT_UPDATE_REQUEST,
+  TEXT_UPDATE_SUCCESS,
+  TEXT_UPDATE_FAIL,
+  TEXT_DELETE_REQUEST,
+  TEXT_DELETE_SUCCESS,
+  TEXT_DELETE_FAIL
 } from '../constants/textConstants'
 
 export const textCreateReducer = (state = {}, action) => {
   switch (action.type) {
-    case LESSSON_TEXT_CREATE_REQUEST:
+    case TEXT_CREATE_REQUEST:
       return { loading: true }
-    case LESSSON_TEXT_CREATE_SUCCESS:
+    case TEXT_CREATE_SUCCESS:
       return { loading: false, success: true, course: action.payload }
-    case LESSSON_TEXT_CREATE_FAIL:
+    case TEXT_CREATE_FAIL:
       return { loading: false, error: action.payload }
-    case LESSSON_TEXT_CREATE_RESET:
+    case TEXT_CREATE_RESET:
       return {}
     default:
       return state
   }
 }
+
+export const textUpdateReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case TEXT_UPDATE_REQUEST:
+      return { loading: true }
+    case TEXT_UPDATE_SUCCESS:
+      return { loading: false, success: true}
+    case TEXT_UPDATE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
+
+export const textDeleteReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case TEXT_DELETE_REQUEST:
+      return { loading: true }
+    case TEXT_DELETE_SUCCESS:
+      return { loading: false, success: true}
+    case TEXT_DELETE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/reducers/videoReducers.js b/src/reducers/videoReducers.js
index 1ea212d58..453be70d5 100644
--- a/src/reducers/videoReducers.js
+++ b/src/reducers/videoReducers.js
@@ -2,7 +2,13 @@ import {
   VIDEO_CREATE_REQUEST,
   VIDEO_CREATE_SUCCESS,
   VIDEO_CREATE_FAIL,
-  VIDEO_CREATE_RESET
+  VIDEO_CREATE_RESET,
+  VIDEO_UPDATE_REQUEST,
+  VIDEO_UPDATE_SUCCESS,
+  VIDEO_UPDATE_FAIL,
+  VIDEO_DELETE_REQUEST,
+  VIDEO_DELETE_SUCCESS,
+  VIDEO_DELETE_FAIL
 } from '../constants/videoConstants'
 
 export const videoCreateReducer = (state = {}, action) => {
@@ -19,3 +25,29 @@ export const videoCreateReducer = (state = {}, action) => {
       return state
   }
 }
+
+export const videoUpdateReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case VIDEO_UPDATE_REQUEST:
+      return { loading: true }
+    case VIDEO_UPDATE_SUCCESS:
+      return { loading: false, success: true}
+    case VIDEO_UPDATE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
+
+export const videoDeleteReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case VIDEO_DELETE_REQUEST:
+      return { loading: true }
+    case VIDEO_DELETE_SUCCESS:
+      return { loading: false, success: true}
+    case VIDEO_DELETE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/screens/communityNews/CommunityNews.jsx b/src/screens/communityNews/CommunityNews.jsx
index 315be0b0e..a8172d0a7 100644
--- a/src/screens/communityNews/CommunityNews.jsx
+++ b/src/screens/communityNews/CommunityNews.jsx
@@ -8,7 +8,7 @@ import NewsAddModal from '../../components/newAddModal/NewsAddModal'
 import Filter from '../../components/filter/Filter'
 import useSizeFinder from '../../utils/sizeFinder'
 import { useDispatch, useSelector } from 'react-redux'
-import { searchNews, listNews } from '../../actions/newsActions'
+import { searchNews, listNews, deleteNews } from '../../actions/newsActions'
 import Pagination from '../../components/pagination/Pagination'
 import axios from 'axios'
 
@@ -19,20 +19,50 @@ function CommunityNews () {
 
   const [addModal, setAddModal] = useState(false)
   const [editData, setEditData] = useState(null)
+  const [deleteModal, setDeleteModal] = useState(false)
+  const [deleteId, setDeleteId] = useState(null)
+
+  const dispatch = useDispatch();
+  const history = useHistory();
+
+   const deleteNewsCard = (id) => {
+    setDeleteId(id)
+    setDeleteModal(true);
+  }
+
+  const confirmDelete = () => {
+    dispatch(deleteNews(deleteId))
+    setDeleteModal(false);
+  }
 
   const editCard = async (id) => {
-    const { data } = await axios.get(`${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
-    setEditData(data)
-    setAddModal(true)
+    // const { data } = await axios.get(`${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
+    // setEditData(data)
+    // setAddModal(true)
+    history.push(`/community-news/edit/${id}`)
   }
   return (
+    <>
+    {deleteModal && <div className='simple-modal-container'>
+        <div className='simple-modal-inner-container'>
+          <div>
+            <h4>Are you sure you want to delete?</h4>
+            {/* <button onClick={() => confirmDelete}><img src='/img/close-outline.svg' alt='close-outline' /></button> */}
+          </div>
+          <div>
+            <button className='secondary-btn' onClick={confirmDelete}>Confirm</button>
+            <button className='secondary-btn' onClick={() => setDeleteModal(false)}>Cancel</button>
+          </div>
+        </div>
+      </div>}
     <DashboardLayout title='Ragrarians News'>{addModal && <NewsAddModal
       setAddModal={setAddModal}
       editData={editData}
       setEditData={setEditData}
                                                           />}
-      <CommunityPagenews {...CommunityPageNewsData} setAddModal={setAddModal} editCard={editCard} />
+      <CommunityPagenews {...CommunityPageNewsData} setAddModal={setAddModal} editCard={editCard} deleteNewsCard={deleteNewsCard}/>
     </DashboardLayout>
+    </>
   )
 }
 
@@ -68,7 +98,8 @@ function CommunityPagenews (props) {
     carsIndustry,
     mediaNews,
     seeAllTopics,
-    setAddModal
+    setAddModal,
+    deleteNewsCard
   } = props
 
   const windowWidth = useSizeFinder()
@@ -105,7 +136,7 @@ function CommunityPagenews (props) {
         </div>
         <div className='community-page-news-section'>
           <div className='community-news-cards'>
-            <NewsCard news={news} editCard={props.editCard} />
+            <NewsCard news={news} editCard={props.editCard} deleteNewsCard={deleteNewsCard} />
             <Pagination pageNumber={pageNumber} setPageNumber={setPageNumber} resourceList={newsList} />
           </div>
           {(windowWidth < 1200)
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index e62dff06e..5f3da4afe 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -6,162 +6,357 @@ import './NewsAdd.scss'
 import BackButton from '../../../components/backButton/BackButton'
 import CommunityNewsViewPage from '../../communityNewsView/CommunityNewsView'
 import { useDispatch, useSelector } from 'react-redux'
-import { createNews } from '../../../actions/newsActions'
+import { createNews, newsUpdate } from '../../../actions/newsActions'
+import AddContent from '../../courseManager/addLesson/AddContent'
+import { useForm } from 'react-hook-form'
+import { useEffect } from 'react'
+import { useLocation } from 'react-router-dom/cjs/react-router-dom.min'
+import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
+import ContentAdd from '../../../components/contentAdd/ContentAdd'
+import { configFunc, getApi } from '../../../utils/apiFunc'
+import DragDrop from '../../../components/dragDrop/DragDrop'
+import Image from '../../../components/lessonImage/Image'
+import Text from '../../courseManager/addLesson/Text'
+import Video from '../../../components/videoPlayer/Video'
+import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../../utils/urlConstants'
+import EditContent from '../../../components/editContent/EditContent'
+import axios from 'axios'
+import { deleteText, updateText } from '../../../actions/textActions'
+import { deletePhoto, updatePhoto } from '../../../actions/photoActions'
+import { deleteVideo, updateVideo } from '../../../actions/videoActions'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
+  const {success:updateVideoSuccess} = useSelector(state => state.updateVideo)
+  const {success:deleteVideoSuccess} = useSelector(state => state.deleteVideo)
+
+  const {success:updateTextSuccess} = useSelector(state => state.updateText)
+  const {success:deleteTextSuccess} = useSelector(state => state.deleteText)
+
+  const {success:updatePhotoSuccess} = useSelector(state => state.updatePhoto)
+  const {success:deletePhotoSuccess} = useSelector(state => state.deletePhoto)
+  // fetching category from route
+  const {state} = useLocation();
+
   const [createVideoModal, setCreateVideoModal] = useState(false)
   const [createImageModal, setCreateImageModal] = useState(false)
   const [createTextModal, setCreateTextModal] = useState(false)
-  const [videoActive, setVideoActive] = useState(true)
-  const [imageActive, setImageActive] = useState(true)
-  const [textActive, setTextActive] = useState(true)
+  const [deleteVideoModal, setDeleteVideoModal] = useState(false)
+  const [deleteImageModal, setDeleteImageModal] = useState(false)
+  const [deleteTextModal, setDeleteTextModal] = useState(false)
+  const [videoId, setVideoId] = useState(null)
+  const [imageId, setImageId] = useState(null)
+  const [textId, setTextId] = useState(null)
+  // const [videoActive, setVideoActive] = useState(true)
+  // const [imageActive, setImageActive] = useState(true)
+  // const [textActive, setTextActive] = useState(true)
+  const [newsData, setNewsData] = useState([])
+  const [newsSingleData, setNewsSingleData] = useState([])
+  const [category, setCategory] = useState(state?.category || null)
+  const [newsCover, setNewsCover] = useState(null);
+  const [imageData, setImageData] = useState(null)
+  const [videoData, setVideoData] = useState(null)
+  const [textData, setTextData] = useState(null)
+
   const news = useSelector((state) => (state.addNewNews !== {} ? state.addNewNews : ''))
+  const { register, errors, handleSubmit } = useForm()
+
+  const { title, id} = useParams()
+
+  const {pathname} = useLocation();
 
-  const { title, category } = useParams()
+  const dispatch = useDispatch();
+
+  // for edit
+  useEffect(() => {
+    if(pathname.split('/')[2] === 'edit') {
+      getSingleNews()
+    }
+  }, [
+    dispatch, 
+    newsData, 
+    updateVideoSuccess, 
+    deleteVideoSuccess, 
+    updateTextSuccess, 
+    deleteTextSuccess,
+    updatePhotoSuccess, 
+    deletePhotoSuccess
+  ])
+
+  // for creating
+  useEffect(() => {
+    if(pathname.split('/')[2] !== 'edit') {
+      setNewsData([{title, category}])
+    }
+  }, [])
+
+
+  async function getSingleNews () {
+    const { data } = await getApi(dispatch, `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
+    setNewsSingleData(data)
+  }
+
+  const submitNewsForm = ({ title }) => {
+    newsData[0].title = title
+    newsData[0].category = category;
+    dispatch(createNews(newsData, newsCover));
+  }
+
+  const editNewsForm = ({title}) => {
+    dispatch(newsUpdate({id: newsSingleData.id, title, category: newsSingleData.category, newsCover}, newsData))
+  }
+
+  async function editImageFunc (id) {
+    if(newsSingleData?.photos) {
+      let photo = newsSingleData.photos.filter(el => el.id === id);
+      setImageData(photo)
+    }
+  }
+
+  function editImageConfirm (data) {
+    const {id, isImgDesc, lessonImg, photoDescription} = data;
+    dispatch(updatePhoto(id, lessonImg, photoDescription, isImgDesc, setCreateImageModal ))
+  }
+
+  async function editTextFunc (id) {
+    if(newsSingleData?.texts) {
+      let text = newsSingleData.texts.filter(el => el.id === id);
+      setTextData(text)
+    }
+  }
+
+  function editTextConfirm (data) {
+    const {id, textHeading, textDescription} = data;
+    dispatch(updateText(id, textHeading, textDescription, setCreateTextModal))
+  }
+
+  async function editVideoFunc (id) {
+    if(newsSingleData?.videos) {
+      let video = newsSingleData.videos.filter(el => el.id === id);
+      setVideoData(video)
+    }
+  }
+
+   function editVideoConfirm (data) {
+    const {id, videoCover, videoTitle, videoDescription, videoLink, videoResource} = data;
+    dispatch(updateVideo(id,  videoCover, videoTitle, videoDescription, videoLink, videoResource, setCreateVideoModal))
+  }
+
+  function deleteImageModalFunc (id) {
+    setDeleteImageModal(true)
+    setImageId(id)
+  }
+
+  async function deleteImageConfirm () {
+    dispatch(deletePhoto(imageId))
+    setDeleteImageModal(false)
+  }
+
+  function deleteVideoModalFunc (id) {
+    setDeleteVideoModal(true)
+    setVideoId(id)
+  }
+
+  async function deleteVideoConfirm () {
+    dispatch(deleteVideo(videoId))
+    setDeleteVideoModal(false)
+  }
+
+  function deleteTextModalFunc (id) {
+    setDeleteTextModal(true)
+    setTextId(id)
+  }
+
+  async function deleteTextConfirm () {
+    dispatch(deleteText(textId))
+    setDeleteTextModal(false)
+  }
 
   return (
     <>
-      {createVideoModal && <NewsCreateModal type='video' videoActive={videoActive} setVideoActive={setVideoActive} />}
-      {createImageModal && <NewsCreateModal type='image' imageActive={imageActive} setImageActive={setImageActive} />}
-      {createTextModal && <NewsCreateModal type='text' textActive={textActive} setTextActive={setTextActive} />}
-      <DashboardLayout title='Add News'>
+      {
+        createVideoModal && <NewsCreateModal 
+          type='video' 
+          videoActive={createVideoModal} 
+          setVideoActive={setCreateVideoModal} 
+          lessonData={newsData} 
+          setLessonData={setNewsData} 
+          videoData={videoData}
+          editVideoConfirm={editVideoConfirm}
+          />
+      }
+      {
+        createImageModal && <NewsCreateModal 
+          type='image' 
+          imageActive={createImageModal} 
+          setImageActive={setCreateImageModal} 
+          lessonData={newsData} 
+          setLessonData={setNewsData} 
+          imageData={imageData}
+          editImageConfirm={editImageConfirm}
+          />
+      }
+      {
+        createTextModal && <NewsCreateModal 
+          type='text' 
+          textActive={createTextModal} 
+          setTextActive={setCreateTextModal} 
+          lessonData={newsData} 
+          setLessonData={setNewsData} 
+          textData={textData}
+          editTextConfirm={editTextConfirm}
+      />
+      }
+      {deleteVideoModal && <DeleteContent setDeleteModal={setDeleteVideoModal} confirmDelete={deleteVideoConfirm} />}
+      {deleteImageModal && <DeleteContent setDeleteModal={setDeleteImageModal} confirmDelete={deleteImageConfirm} />}
+      {deleteTextModal && <DeleteContent setDeleteModal={setDeleteTextModal} confirmDelete={deleteTextConfirm} />}
+      <DashboardLayout title={pathname.split('/')[2] === 'edit' ? 'Edit News' : 'Add News'}>
         <BackButton location={`/community-page-news/${currentCommunity.slug}`} />
-        <NewsAddMainContainer
-          setCreateVideoModal={setCreateVideoModal}
-          setCreateImageModal={setCreateImageModal}
-          news={news}
-          title={title}
-          category={category}
-          setCreateTextModal={setCreateTextModal}
-          setTextActive={setTextActive}
-          setImageActive={setImageActive}
-          setVideoActive={setVideoActive}
-
+        <AddNewsContent
+          setVideoModal = {setCreateVideoModal}
+          setImageModal = {setCreateImageModal}
+          setTextModal = {setCreateTextModal}
+          register={register}
+          errors={errors}
+          setNewsData = {setNewsData}
+          newsData = {newsData}
+          newsSingleData = {newsSingleData}
+          setNewsCover={setNewsCover}
+          editVideoFunc={editVideoFunc}
+          editImageFunc={editImageFunc}
+          editTextFunc={editTextFunc}
+          setDeleteVideoModal={deleteVideoModalFunc}
+          setDeleteImageModal={deleteImageModalFunc}
+          setDeleteTextModal={deleteTextModalFunc}
         />
+
+        {
+          pathname.split('/')[2] === 'edit'
+          ? <NewsSaveModal onClick={handleSubmit(editNewsForm)}  name="Edit" />
+          : <NewsSaveModal onClick={handleSubmit(submitNewsForm)} name="Save" />
+        }
+
       </DashboardLayout>
     </>
   )
 }
 
-function NewsAddMainContainer ({
-  setCreateVideoModal,
-  setCreateImageModal,
-  setCreateTextModal,
-  setVideoActive,
-  setImageActive,
-  setTextActive,
-  news,
-  title,
-  category
-
-}) {
-  function createVideo () {
-    setCreateVideoModal(true)
-    setCreateImageModal(false)
-    setCreateTextModal(false)
-    setVideoActive(true)
-  }
+const DeleteContent = ({confirmDelete, setDeleteModal}) => {
+  return <div className='simple-modal-container'>
+        <div className='simple-modal-inner-container'>
+          <div>
+            <h4>Are you sure you want to delete?</h4>
+            {/* <button onClick={() => confirmDelete}><img src='/img/close-outline.svg' alt='close-outline' /></button> */}
+          </div>
+          <div>
+            <button className='secondary-btn' onClick={confirmDelete}>Confirm</button>
+            <button className='secondary-btn' onClick={() => setDeleteModal(false)}>Cancel</button>
+          </div>
+        </div>
+      </div>
+}
 
-  function createImage () {
-    setCreateVideoModal(false)
-    setCreateImageModal(true)
-    setCreateTextModal(false)
-    setImageActive(true)
-  }
+const AddNewsContent = ({
+  errors,
+  newsData,
+  setVideoModal,
+  setImageModal,
+  setTextModal,
+  register,
+  newsSingleData,
+  setNewsCover,
+  editImageFunc,
+  editVideoFunc,
+  editTextFunc,
+  setDeleteVideoModal,
+  setDeleteImageModal,
+  setDeleteTextModal
+}) => {
 
-  function createText () {
-    setCreateVideoModal(false)
-    setCreateImageModal(false)
-    setCreateTextModal(true)
-    setTextActive(true)
-  }
+  const [title, setTitle] = useState('');
+  
+  // for creation
+  useEffect(() => {
+    if(newsData.length > 0) {
+      setTitle(newsData[0].title)
+    }
+  }, [newsData])
 
-  return (
-    <div className='news-add-main-container'>
-      <NewsAddContainer
-        title={title}
-        news={news}
-        createVideo={createVideo}
-        createImage={createImage}
-        createText={createText}
+  // for Edit
+  useEffect(() => {
+    if(newsSingleData) {
+      setTitle(newsSingleData.title)
+    }
+  }, [newsSingleData])
+  
+
+  return  <div className='admin-lesson-create-container'>
+      <ErrorText
+        className='errorMsg'
+        message={errors.title && errors.title.message}
+      />
+      <input
+        type='text'
+        placeholder='Write Title Here'
+        name='title'
+        defaultValue={title}
+        ref={register({
+          required: {
+            value: true,
+            message: 'You must enter news title'
+          }
+        })}
+      />
+
+      <DragDrop
+        onChange={(img) => setNewsCover(img)}
+        text='Drag & Drop photo in this area or Click Here to attach'
+        dataImg={newsSingleData?._attachments ? `${process.env.REACT_APP_CDN_BASE_URL}/news/${newsSingleData?._attachments}` : ''}
+        onClick={() => setNewsCover(null)}
       />
-      <div>{Object.entries(news).length !== 0 && <PopUp news={news} title={title} category={category} />}</div>
+
+      {
+        newsSingleData && <EditContent 
+        data={newsSingleData}
+        setEditPhotoModel={setImageModal}
+        setEditTextModel={setTextModal}
+        setEditVideoModel={setVideoModal}
+        editVideoFunc={editVideoFunc}
+        editImageFunc={editImageFunc}
+        editTextFunc={editTextFunc}
+        removeTextItem={setDeleteTextModal}
+        removePhoto={setDeleteImageModal}
+        removeVideo={setDeleteVideoModal}
+        />
+      }
+
+      <ContentAdd data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal} />
     </div>
-  )
 }
 
-function NewsAddContainer ({ createVideo, createImage, createText, title, news }) {
+const NewsSaveModal = ({ pathId, onClick, name}) => {
+  const history = useHistory()
   return (
-    <div className='news-add-container'>
-      <NewContent title={title} news={news} />
-      <div className='news-add-inner-container'>
-        <button onClick={() => createVideo()} className='add-btn'>
-          <img src='/img/video-outline.svg' alt='Add video' /> <span>Add video</span>
+    <div className='save-lesson-modal'>
+      <h4>Do you want to {name} News?</h4>
+      <div>
+        <button
+          className='secondary-btn'
+          id='lesson-cancel-btn'
+          onClick={() => history.goBack()}
+        >
+          Cancel
         </button>
-        <button onClick={() => createImage()} className='add-btn'>
-          <img src='/img/camera-outline.svg' alt='Add new img' /> <span>Add image</span>
-        </button>
-        <button onClick={() => createText()} className='add-btn'>
-          <img src='/img/file-text-outline.svg' alt='Add text' />
-          <span>Add text</span>
+        <button
+          className='primary-btn secondary-btn'
+          id='lesson-save-btn'
+          onClick={onClick}
+        >
+          {name} News
         </button>
       </div>
     </div>
   )
 }
 
-function NewContent ({ title, news }) {
-  return (
-    <>
-      <div className='new-title-container'>
-        <h2>{title}</h2>
-        {news && <CommunityNewsViewPage newNews={news} />}
-      </div>
-    </>
-  )
-}
-
-function PopUp ({ news, title, category }) {
-  const { file } = news.imageDetail ? news.imageDetail.file && news.imageDetail : {}
-  const newNews = { ...news, title, category, file }
-  const [activePopup, setActivePopup] = useState(true)
-  const { currentCommunity } = useSelector(state => state.activeCommunity)
-  const dispatch = useDispatch()
-  const history = useHistory()
-  const handleOnSaveClick = (e) => {
-    if (file) {
-      dispatch(createNews(newNews))
-      setActivePopup(false)
-      history.push(`/community-page-news/${currentCommunity.slug}`)
-    } else {
-      dispatch(createNews(newNews))
-      setActivePopup(false)
-      history.push(`/community-page-news/${currentCommunity.slug}`)
-    }
-  }
-
-  const handleOnCancelClick = (e) => {
-    setActivePopup(false)
-    history.push(`/community-page-news/${currentCommunity.slug}`)
-  }
-  return (
-    <>
-      {activePopup && (
-        <div className='popup-box'>
-          <h4>Do you want to save?</h4>
-          <div className='popup-btn-wrapper'>
-            <button onClick={handleOnCancelClick} className='secondary-btn popup-btn'>
-              Cancel
-            </button>
-            <button onClick={handleOnSaveClick} className='default-btn popup-btn'>
-              Save
-            </button>
-          </div>
-        </div>
-      )}
-    </>
-  )
-}
-
 export default NewsAdd
diff --git a/src/screens/communityNewsView/CommunityNewsView.jsx b/src/screens/communityNewsView/CommunityNewsView.jsx
index 0e5aacfe0..aa5c779f7 100644
--- a/src/screens/communityNewsView/CommunityNewsView.jsx
+++ b/src/screens/communityNewsView/CommunityNewsView.jsx
@@ -3,24 +3,46 @@ import './CommunityNewsView.scss'
 import DashboardLayout from '../../layout/dashboardLayout/DashboardLayout'
 import BackButton from '../../components/backButton/BackButton'
 import { useLocation } from 'react-router-dom'
+import { useParams } from 'react-router-dom/cjs/react-router-dom.min'
+import { getApi } from '../../utils/apiFunc'
+import { useDispatch } from 'react-redux'
+import Text from '../courseManager/addLesson/Text'
+import Video from '../../components/videoPlayer/Video'
+import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../utils/urlConstants'
+import Image from '../../components/lessonImage/Image'
 
-function CommunityNewsViewPage ({ newNews }) {
+function CommunityNewsViewPage () {
   const [news, setNews] = useState({})
-  const val = useLocation()?.state?.news
+  // const val = useLocation()?.state?.news
+  
+  // fetching current community
+const currentCommunity = localStorage.getItem('currentCommunity')
+  ? JSON.parse(localStorage.getItem('currentCommunity'))
+  : null
+  const dispatch = useDispatch();
+  const {id} = useParams();
+
   useEffect(() => {
-    setNews(newNews || val)
-  }, [newNews, val])
+    getSingleNews(id);
+  }, [])
+
+  async function getSingleNews (id) {
+    const { data } = await getApi(
+      dispatch,
+      `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`
+    )
+    setNews(data)
+  }
+
+  console.log(news)
 
   return (
     <>
-      {newNews ? (
-        <NewsSingleView news={news} />
-      ) : (
         <DashboardLayout>
           <div className='x03-1-0-news-page'>
             <div className='flex-col-2'>
-              <BackButton location='/community-page-news' />
-              <NewsSingleView news={news} />
+              <BackButton location='/community-page-news' location={`/community-page-news/${currentCommunity.slug}`} />
+              {news && <NewsSingleView news={news} />}
               <div className='button-row-3'>
                 <div className='button-secondary-default border-0-5px-quarter-spanish-white'>
                   <img className='f1' src='/img/facebook-share-icon.svg' alt='facebook-icon' />
@@ -38,7 +60,6 @@ function CommunityNewsViewPage ({ newNews }) {
             </div>
           </div>
         </DashboardLayout>
-      )}
     </>
   )
 }
@@ -56,20 +77,45 @@ const NewsSingleView = ({ news }) => {
           {news?.readTime}
         </div>
       </div>
-      <div className='news-add-img-wrapper'>
-        <img src='/img/newsbg-image.png' alt='community-single-article' />
-      </div>
-      <div className='text-container'>
-        <p>{news?.textDetail?.collectionTitle}</p>
-        <p>{news?.textDetail?.collectionDescription}</p>
-      </div>
-      <div className='text-container'>
-        <p>{news?.imageDetail?.imageDescription}</p>
-      </div>
-      <div className='text-container'>
-        <p>{news?.videoDetail?.videoTitle}</p>
-        <p>{news?.videoDetail?.videoDescription}</p>
-      </div>
+
+      <Image
+          src={`${process.env.REACT_APP_CDN_BASE_URL}/news/${news?._attachments}`}
+        />
+
+    {
+        news?.photos && news?.photos.map(item => {
+          return <Image
+          src={`${LESSON_IMG}${item?.lessonImg}`}
+          desc={
+            item?.isImgDesc === true && item?.photoDescription
+          }
+        />
+        })
+      }
+
+      {
+        news?.texts && news?.texts.map(item => {
+          return <Text
+          heading={item?.textHeading}
+          desc={item?.textDescription}
+        />
+        })
+      }
+
+      {
+        news?.videos && news?.videos.map(item => {
+          return <Video
+            title={item?.videoTitle}
+            description={item?.videoDescription}
+            url={
+              item?.videoLink === 'undefined'
+                ? `${GET_VIDEO}${item?.videoResource}`
+                : item?.videoLink
+              }
+            thumbnail={`${VIDEO_COVER}${item?.videoCover}`}
+          />
+        })
+      }
     </>
   )
 }
diff --git a/src/screens/courseManager/addLesson/Actions.jsx b/src/screens/courseManager/addLesson/Actions.jsx
new file mode 100644
index 000000000..1887cbc07
--- /dev/null
+++ b/src/screens/courseManager/addLesson/Actions.jsx
@@ -0,0 +1,37 @@
+import React, { useState } from 'react'
+import useHideOnClick from '../../../utils/useHideOnClick'
+const LessonActions = ({ id, onRemove = () => {}, poopUp, refetch }) => {
+  const [actionActive, setActionActive] = useState(false)
+
+  const domNode = useHideOnClick(() => {
+    setActionActive(false)
+  })
+
+  const openCloseModal = () => {
+    poopUp()
+    setActionActive(!actionActive)
+  }
+
+  return (
+    <div className='actions lessonAction' ref={domNode}>
+      <button
+        className='secondary-btn lesson-btn'
+        onClick={() => setActionActive(!actionActive)}
+      >
+        <img src='/img/more-horizontal.svg' alt='horizontal icon' />
+      </button>
+      {actionActive && (
+        <ul className={actionActive ? 'actionBtn show' : 'hide'}>
+          <li
+            onClick={openCloseModal}
+          >
+            Edit
+          </li>
+          <li onClick={() => onRemove(id)}>Delete</li>
+        </ul>
+      )}
+    </div>
+  )
+}
+
+export default LessonActions
diff --git a/src/screens/courseManager/addLesson/AddContent.jsx b/src/screens/courseManager/addLesson/AddContent.jsx
index efaa555be..53f4286c1 100644
--- a/src/screens/courseManager/addLesson/AddContent.jsx
+++ b/src/screens/courseManager/addLesson/AddContent.jsx
@@ -1,8 +1,7 @@
+import React from 'react'
 import DragDrop from '../../../components/dragDrop/DragDrop'
 import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
-import Video from '../../../components/videoPlayer/Video'
-import Image from '../../../components/lessonImage/Image'
-import Text from './Text'
+import ContentAdd from '../../../components/contentAdd/ContentAdd'
 
 const AddContent = ({
   setVideoModal,
@@ -44,34 +43,7 @@ const AddContent = ({
         onChange={(img) => setLessonCover(img)}
         fileType='image/png,image/jpeg,image/jpg'
       />
-
-      {lessonData &&
-        lessonData.map((vid, index) => (
-          <div key={index}>
-            <Video
-              title={vid.videoTitle}
-              description={vid.videoDescription}
-              url={vid.videoLink || vid.videoResource?.preview}
-              thumbnail={vid.videoCover?.preview}
-            />
-            <Image src={vid.lessonImg?.preview} desc={vid.photoDescription} />
-            <Text heading={vid.textHeading} desc={vid.textDescription} />
-          </div>
-        ))}
-      <div className='admin-lesson-create-btn-wrapper'>
-        <button className='secondary-btn' onClick={() => setVideoModal(true)}>
-          <img src='/img/video-outline.svg' alt='video icon' />{' '}
-          <span>Add video</span>
-        </button>
-        <button className='secondary-btn' onClick={() => setImageModal(true)}>
-          <img src='/img/image-outline.svg' alt='image_icon' />
-          <span>Add image</span>
-        </button>
-        <button className='secondary-btn' onClick={() => setTextModal(true)}>
-          <img src='/img/text-outline.svg' alt='text icon' />{' '}
-          <span>Add text</span>
-        </button>
-      </div>
+      <ContentAdd data={lessonData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
     </div>
   )
 }
diff --git a/src/screens/courseManager/addLesson/Text.jsx b/src/screens/courseManager/addLesson/Text.jsx
index 8700bdbe4..e3b02e09a 100644
--- a/src/screens/courseManager/addLesson/Text.jsx
+++ b/src/screens/courseManager/addLesson/Text.jsx
@@ -1,11 +1,40 @@
+import Actions from './Actions'
+
 import './Text.scss'
-const Text = ({ heading, desc }) => {
+const Text = ({
+  heading,
+  desc,
+  onRemove,
+  id,
+  setEditTextModel,
+  modelPopUp,
+  isEditable,
+  refetch
+}) => {
+  const poopUp = () => {
+    modelPopUp(id)
+    setEditTextModel(true)
+  }
   return (
     <>
       {heading || desc ? (
         <div className='text'>
-          <h1>{heading}</h1>
-          <p>{desc}</p>
+          <div className='block'>
+            <h1>{heading}</h1>
+            <p>
+              {desc} {id}
+            </p>
+          </div>
+          {isEditable ? (
+            <Actions
+              onRemove={onRemove}
+              id={id}
+              poopUp={poopUp}
+              refetch={refetch}
+            />
+          ) : (
+            ''
+          )}
         </div>
       ) : (
         ''
diff --git a/src/screens/courseManager/addLesson/Text.scss b/src/screens/courseManager/addLesson/Text.scss
index e0c1ad92c..17813e81e 100644
--- a/src/screens/courseManager/addLesson/Text.scss
+++ b/src/screens/courseManager/addLesson/Text.scss
@@ -1,22 +1,43 @@
 .text {
+  display: flex;
+  justify-content: space-between;
   margin: 2em 0;
+  position: relative;
+  color: var(--primary-white);
+  
+  .block {
+    width: 93%;
+    h1 {
+      font-weight: 600;
+      text-transform: uppercase;
+      font-size: 1.25em;
+      line-height: 1.5em;
+      font-family: inherit;
+      margin: 0.5em 0;
+    }
+    p {
+      font-weight: 400;
+      font-size: 1em;
+      line-height: 1.5em;
+      font-family: inherit;
 
-  h1 {
-    font-weight: 600;
-    text-transform: uppercase;
-    font-size: 1.25em;
-    line-height: 1.5em;
-    font-family: inherit;
-    margin: 0.5em 0;
+      &::first-letter {
+        text-transform: uppercase;
+      }
+    }
   }
-  p {
-    font-weight: 400;
-    font-size: 1em;
-    line-height: 1.5em;
-    font-family: inherit;
+  .lessonAction {
+    width: 6%;
+    margin-left: 1%;
 
-    &::first-letter {
-      text-transform: uppercase;
+    button {
+      width: 100%;
+    }
+
+    @media (max-width: 850px) {
+      position: relative;
+      top: 0;
+      left: 0;
     }
   }
 }
diff --git a/src/screens/courseManager/addLesson/addImage.js b/src/screens/courseManager/addLesson/addImage.js
index 0246860a9..f51d42f93 100644
--- a/src/screens/courseManager/addLesson/addImage.js
+++ b/src/screens/courseManager/addLesson/addImage.js
@@ -1,10 +1,10 @@
 import { createLessonImg } from '../../../actions/photoActions'
 
-export const addImage = function ({ lessonData, lessonId, dispatch }) {
-  const lessonImg = lessonData.lessonImg
-  const photoDescription = lessonData.photoDescription
-  const isImgDesc = lessonData.isImgDesc
+export const addImage = function ({ data, lessonId, newsId, dispatch }) {
+  const lessonImg = data.lessonImg
+  const photoDescription = data.photoDescription
+  const isImgDesc = data.isImgDesc
   return dispatch(
-    createLessonImg(lessonImg, photoDescription, isImgDesc, lessonId)
+    createLessonImg(lessonImg, photoDescription, isImgDesc, lessonId, newsId)
   )
 }
diff --git a/src/screens/courseManager/addLesson/addText.js b/src/screens/courseManager/addLesson/addText.js
index a878e5717..05381f10a 100644
--- a/src/screens/courseManager/addLesson/addText.js
+++ b/src/screens/courseManager/addLesson/addText.js
@@ -1,8 +1,8 @@
 import { createText } from '../../../actions/textActions'
 
-export const addText = function ({ lessonData, lessonId, dispatch }) {
-  const textHeading = lessonData.textHeading
-  const textDescription = lessonData.textDescription
+export const addText = function ({ data, lessonId, newsId, dispatch }) {
+  const textHeading = data.textHeading
+  const textDescription = data.textDescription
 
-  return dispatch(createText(textHeading, textDescription, lessonId))
+  return dispatch(createText(textHeading, textDescription, lessonId, newsId))
 }
diff --git a/src/screens/courseManager/addLesson/addVideo.js b/src/screens/courseManager/addLesson/addVideo.js
index 66cd28908..a26cd74dc 100644
--- a/src/screens/courseManager/addLesson/addVideo.js
+++ b/src/screens/courseManager/addLesson/addVideo.js
@@ -1,12 +1,11 @@
 import { createVideo } from '../../../actions/videoActions'
 
-export const addVideo = function ({ lessonData, lessonId, dispatch }) {
-  const videoCover = lessonData.videoCover
-  const videoTitle = lessonData.videoTitle
-  const videoDescription = lessonData.videoDescription
-  const videoLink = lessonData.videoLink
-  const videoResource = lessonData.videoResource
-
+export const addVideo = function ({ data, lessonId, newsId, dispatch }) {
+  const videoCover = data.videoCover
+  const videoTitle = data.videoTitle
+  const videoDescription = data.videoDescription
+  const videoLink = data.videoLink
+  const videoResource = data.videoResource
   return dispatch(
     createVideo(
       videoCover,
@@ -14,7 +13,8 @@ export const addVideo = function ({ lessonData, lessonId, dispatch }) {
       videoDescription,
       videoLink,
       videoResource,
-      lessonId
+      lessonId,
+      newsId
     )
   )
 }
diff --git a/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss b/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss
index ef0638305..a09c65cf6 100644
--- a/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss
+++ b/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss
@@ -243,7 +243,7 @@
     color: var(--primary-white);
     border: 0.5px solid var(--primary-white);
     padding: 0.5em 1em;
-    z-index: 99999;
+    z-index: 500;
     border-radius: 0.2em;
 
     li {
diff --git a/src/store.js b/src/store.js
index fb374c3cc..8348aa341 100644
--- a/src/store.js
+++ b/src/store.js
@@ -17,9 +17,9 @@ import {
   lessonCreateReducer,
   lessonUpdateReducer
 } from './reducers/lessonReducers'
-import { videoCreateReducer } from './reducers/videoReducers'
-import { photoCreateReducer } from './reducers/photoReducer'
-import { textCreateReducer } from './reducers/textReducer'
+import { videoCreateReducer, videoDeleteReducer, videoUpdateReducer } from './reducers/videoReducers'
+import { photoCreateReducer, photoDeleteReducer, photoUpdateReducer } from './reducers/photoReducer'
+import { textCreateReducer, textDeleteReducer, textUpdateReducer } from './reducers/textReducer'
 import { materialCreateReducer } from './reducers/materiallReducer'
 import {
   testCreateReducer,
@@ -111,8 +111,14 @@ const reducer = combineReducers({
   addLesson: lessonCreateReducer,
   updateLesson: lessonUpdateReducer,
   addVideo: videoCreateReducer,
+  updateVideo: videoUpdateReducer,
+  deleteVideo: videoDeleteReducer,
   addPhoto: photoCreateReducer,
+  updatePhoto: photoUpdateReducer,
+  deletePhoto: photoDeleteReducer,
   addText: textCreateReducer,
+  updateText: textUpdateReducer,
+  deleteText: textDeleteReducer,
   addMaterial: materialCreateReducer,
   addTest: testCreateReducer,
   listTestQuestions: testQuestionListReducer,
diff --git a/src/utils/urlConstants.js b/src/utils/urlConstants.js
index 2998ac9bf..d4300c990 100644
--- a/src/utils/urlConstants.js
+++ b/src/utils/urlConstants.js
@@ -23,15 +23,19 @@ export const GET_LESSONS = BASE_URL + 'lessons'
 export const ADD_LESSONS = BASE_URL + 'lessons/add'
 
 // videos
+export const GET_VIDEOS = BASE_URL + 'videos'
 export const ADD_VIDEOS = BASE_URL + 'videos/add'
 
 // lesson photos
-export const ADD_LESSON_PHOTO = BASE_URL + 'lesson-photos/add'
+export const GET_LESSON_PHOTO = BASE_URL + 'photos'
+export const ADD_LESSON_PHOTO = BASE_URL + 'photos/add'
 
 // lesson Text
-export const ADD_LESSON_TEXT = BASE_URL + 'lesson-text/add'
+export const GET_LESSON_TEXT = BASE_URL + 'texts'
+export const ADD_LESSON_TEXT = BASE_URL + 'texts/add'
 
 // lesson material
+export const GET_MATERIAL = BASE_URL + 'materials'
 export const ADD_MATERIAL = BASE_URL + 'materials/add'
 
 // enroll
@@ -43,5 +47,5 @@ export const GET_THUMBNAIL = CDN_URL + '/thumbnail/'
 export const GET_COVERIMG = CDN_URL + '/coverImg/'
 export const GET_VIDEO = CDN_URL + '/videoResource/'
 export const VIDEO_COVER = CDN_URL + '/videoCover/'
-export const LESSON_IMG = CDN_URL + '/lessonImg/'
+export const LESSON_IMG = CDN_URL + '/img/'
 export const MATERIAL = CDN_URL + '/material/'