diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Repositories/QuestionDifficultyRateRepository.java b/backend/src/main/java/com/group1/programminglanguagesforum/Repositories/QuestionDifficultyRateRepository.java
index 63ec5b5..9a8edfc 100644
--- a/backend/src/main/java/com/group1/programminglanguagesforum/Repositories/QuestionDifficultyRateRepository.java
+++ b/backend/src/main/java/com/group1/programminglanguagesforum/Repositories/QuestionDifficultyRateRepository.java
@@ -15,5 +15,5 @@ public interface QuestionDifficultyRateRepository extends JpaRepository<Question
 
     Optional<QuestionDifficultyRate> findByQuestionAndUser(Question question, User user);
 
-    long countByDifficulty(DifficultyLevel difficultyLevel);
+    long countByDifficultyAndQuestion(DifficultyLevel difficultyLevel, Question question);
 }
diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionDifficultyRateService.java b/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionDifficultyRateService.java
index 2f59d1d..86e62a7 100644
--- a/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionDifficultyRateService.java
+++ b/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionDifficultyRateService.java
@@ -8,23 +8,22 @@
 import com.group1.programminglanguagesforum.Exceptions.UnauthorizedAccessException;
 import com.group1.programminglanguagesforum.Repositories.QuestionDifficultyRateRepository;
 import com.group1.programminglanguagesforum.Repositories.QuestionRepository;
+import java.util.NoSuchElementException;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
 
-import java.util.NoSuchElementException;
-import java.util.Optional;
-
 @Service
 @RequiredArgsConstructor
 public class QuestionDifficultyRateService {
+
     private final QuestionDifficultyRateRepository questionDifficultyRateRepository;
     private final UserContextService userContextService;
     private final QuestionRepository questionRepository;
 
-
     public QuestionRateResponseDto rateQuestion(Long id, DifficultyLevel difficultyLevel) throws UnauthorizedAccessException {
-       Question question = questionRepository.findById(id).orElseThrow(() -> new NoSuchElementException("Question not found"));
+        Question question = questionRepository.findById(id).orElseThrow(() -> new NoSuchElementException("Question not found"));
         User user = userContextService.getCurrentUser();
         Optional<QuestionDifficultyRate> questionDifficultyRateOptional = getQuestionDifficultyRate(question, user);
         QuestionDifficultyRate questionDifficultyRate = questionDifficultyRateOptional.orElseGet(() -> {
@@ -35,7 +34,21 @@ public QuestionRateResponseDto rateQuestion(Long id, DifficultyLevel difficultyL
         });
         questionDifficultyRate.setDifficulty(difficultyLevel);
         questionDifficultyRateRepository.save(questionDifficultyRate);
-        QuestionRateCounts result = getResult();
+        QuestionRateCounts result = getResult(id);
+
+        DifficultyLevel newDifficulty = question.getDifficulty();
+
+        if (result.easyCount() > result.mediumCount() && result.easyCount() > result.hardCount()) {
+            newDifficulty = DifficultyLevel.EASY;
+        } else if (result.mediumCount() > result.easyCount() && result.mediumCount() > result.hardCount()) {
+            newDifficulty = DifficultyLevel.MEDIUM;
+        } else if (result.hardCount() > result.easyCount() && result.hardCount() > result.mediumCount()) {
+            newDifficulty = DifficultyLevel.HARD;
+        }
+
+        question.setDifficulty(newDifficulty);
+        questionRepository.save(question);
+
         return QuestionRateResponseDto.builder()
                 .questionId(id)
                 .easyCount(result.easyCount())
@@ -44,8 +57,6 @@ public QuestionRateResponseDto rateQuestion(Long id, DifficultyLevel difficultyL
                 .totalCount(result.easyCount() + result.mediumCount() + result.hardCount())
                 .build();
 
-
-
     }
 
     public Optional<QuestionDifficultyRate> getQuestionDifficultyRate(Question question, User user) {
@@ -53,13 +64,15 @@ public Optional<QuestionDifficultyRate> getQuestionDifficultyRate(Question quest
     }
 
     @NonNull
-    public QuestionRateCounts getResult() {
-        long easyCount = questionDifficultyRateRepository.countByDifficulty(DifficultyLevel.EASY);
-        long mediumCount = questionDifficultyRateRepository.countByDifficulty(DifficultyLevel.MEDIUM);
-        long hardCount = questionDifficultyRateRepository.countByDifficulty(DifficultyLevel.HARD);
+    public QuestionRateCounts getResult(Long questionId) {
+        Question question = questionRepository.findById(questionId).orElseThrow(() -> new NoSuchElementException("Question not found"));
+        long easyCount = questionDifficultyRateRepository.countByDifficultyAndQuestion(DifficultyLevel.EASY, question);
+        long mediumCount = questionDifficultyRateRepository.countByDifficultyAndQuestion(DifficultyLevel.MEDIUM, question);
+        long hardCount = questionDifficultyRateRepository.countByDifficultyAndQuestion(DifficultyLevel.HARD, question);
         return new QuestionRateCounts(easyCount, mediumCount, hardCount);
     }
 
     public record QuestionRateCounts(long easyCount, long mediumCount, long hardCount) {
+
     }
 }
diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionService.java b/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionService.java
index 35efcf9..31298f7 100644
--- a/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionService.java
+++ b/backend/src/main/java/com/group1/programminglanguagesforum/Services/QuestionService.java
@@ -1,21 +1,5 @@
 package com.group1.programminglanguagesforum.Services;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.Objects;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Service;
-
 import com.group1.programminglanguagesforum.DTOs.Requests.CreateQuestionRequestDto;
 import com.group1.programminglanguagesforum.DTOs.Requests.UpdateQuestionRequestDto;
 import com.group1.programminglanguagesforum.DTOs.Responses.AuthorDto;
@@ -32,244 +16,258 @@
 import com.group1.programminglanguagesforum.Repositories.BookmarkRepository;
 import com.group1.programminglanguagesforum.Repositories.QuestionRepository;
 import com.group1.programminglanguagesforum.Repositories.VoteRepository;
-
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class QuestionService {
-        private final QuestionRepository questionRepository;
-        private final UserContextService userContextService;
-        private final TagService tagService;
-        private final BookmarkRepository bookmarkRepository;
-        private final VoteRepository voteRepository;
-        private final QuestionDifficultyRateService questionDifficultyRateService;
 
-        public Optional<Question> findById(Long id) {
-                return questionRepository.findById(id);
-        }
+    private final QuestionRepository questionRepository;
+    private final UserContextService userContextService;
+    private final TagService tagService;
+    private final BookmarkRepository bookmarkRepository;
+    private final VoteRepository voteRepository;
+    private final QuestionDifficultyRateService questionDifficultyRateService;
 
-        public List<QuestionSummaryDto> findByAuthorId(Long authorId) {
-                return questionRepository.findByAuthorId(authorId).stream()
-                                .map(QuestionService::mapToQuestionSummary)
-                                .collect(Collectors.toList());
-        }
+    public Optional<Question> findById(Long id) {
+        return questionRepository.findById(id);
+    }
 
-        public CreateQuestionResponseDto createQuestion(CreateQuestionRequestDto dto)
-                        throws UnauthorizedAccessException {
-                List<Long> tagIds = dto.getTagIds();
-                Set<Tag> existingTags = new HashSet<>(tagService.findAllByIdIn(tagIds));
-                User currentUser = userContextService.getCurrentUser();
-                Date date = new Date();
-                Question question = Question.builder()
-                                .title(dto.getTitle())
-                                .questionBody(dto.getContent())
-                                .difficulty(dto.getDifficulty())
-                                .askedBy(currentUser)
-                                .createdAt(date)
-                                .updatedAt(date)
-                                .likeCount(0L)
-                                .commentCount(0L)
-                                .tags(existingTags)
-                                .votes(new ArrayList<>())
-                                .build();
-                questionRepository.save(question);
-                List<TagDto> tags = existingTags.stream().map(tag -> TagDto.builder()
-                                .id(tag.getId())
-                                .name(tag.getTagName())
-                                .build()).toList();
+    public List<QuestionSummaryDto> findByAuthorId(Long authorId) {
+        return questionRepository.findByAuthorId(authorId).stream()
+                .map(QuestionService::mapToQuestionSummary)
+                .collect(Collectors.toList());
+    }
 
-                return CreateQuestionResponseDto.builder()
-                                .id(question.getId())
-                                .title(question.getTitle())
-                                .content(question.getQuestionBody())
-                                .difficulty(question.getDifficulty())
-                                .tags(tags)
-                                .author(AuthorDto.builder()
-                                                .id(currentUser.getId())
-                                                .username(currentUser.getUsername())
-                                                .reputationPoints(currentUser.getReputationPoints())
-                                                .name(currentUser.getFirstName() + " " + currentUser.getLastName())
-                                                .build())
-                                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
-                                .updatedAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getUpdatedAt()))
-                                .upvoteCount(0L)
-                                .downvoteCount(0L)
-                                .build();
+    public CreateQuestionResponseDto createQuestion(CreateQuestionRequestDto dto)
+            throws UnauthorizedAccessException {
+        List<Long> tagIds = dto.getTagIds();
+        Set<Tag> existingTags = new HashSet<>(tagService.findAllByIdIn(tagIds));
+        User currentUser = userContextService.getCurrentUser();
+        Date date = new Date();
+        Question question = Question.builder()
+                .title(dto.getTitle())
+                .questionBody(dto.getContent())
+                .difficulty(dto.getDifficulty())
+                .askedBy(currentUser)
+                .createdAt(date)
+                .updatedAt(date)
+                .likeCount(0L)
+                .commentCount(0L)
+                .tags(existingTags)
+                .votes(new ArrayList<>())
+                .build();
+        questionRepository.save(question);
+        List<TagDto> tags = existingTags.stream().map(tag -> TagDto.builder()
+                .id(tag.getId())
+                .name(tag.getTagName())
+                .build()).toList();
 
-        }
+        return CreateQuestionResponseDto.builder()
+                .id(question.getId())
+                .title(question.getTitle())
+                .content(question.getQuestionBody())
+                .difficulty(question.getDifficulty())
+                .tags(tags)
+                .author(AuthorDto.builder()
+                        .id(currentUser.getId())
+                        .username(currentUser.getUsername())
+                        .reputationPoints(currentUser.getReputationPoints())
+                        .name(currentUser.getFirstName() + " " + currentUser.getLastName())
+                        .build())
+                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
+                .updatedAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getUpdatedAt()))
+                .upvoteCount(0L)
+                .downvoteCount(0L)
+                .build();
 
-        public GetQuestionDetailsResponseDto getQuestion(Long id) throws NoSuchElementException {
-                User currentUser;
-                try {
-                        currentUser = userContextService.getCurrentUser();
-                } catch (UnauthorizedAccessException e) {
-                        currentUser = null;
-                }
+    }
 
-                Optional<Question> questionOptional = questionRepository.findById(id);
-                if (questionOptional.isEmpty()) {
-                        throw new NoSuchElementException("Question not found");
-                }
+    public GetQuestionDetailsResponseDto getQuestion(Long id) throws NoSuchElementException {
+        User currentUser;
+        try {
+            currentUser = userContextService.getCurrentUser();
+        } catch (UnauthorizedAccessException e) {
+            currentUser = null;
+        }
 
-                Question question = questionOptional.get();
-                boolean selfQuestion = (currentUser != null
-                                && currentUser.getId().equals(question.getAskedBy().getId()));
-                boolean isBookmarked = (currentUser != null
-                                && bookmarkRepository.existsByUserAndQuestion(currentUser, question));
-                Integer selfVoted = (currentUser != null
-                                && voteRepository.findByUserAndQuestion(currentUser, question).isPresent()
-                                                ? voteRepository.findByUserAndQuestion(currentUser, question).get()
-                                                                .isUpvote() ? 1 : -1
-                                                : 0);
-                QuestionDifficultyRateService.QuestionRateCounts record = questionDifficultyRateService.getResult();
-                long easyCount = record.easyCount();
-                long mediumCount = record.mediumCount();
-                long hardCount = record.hardCount();
-                DifficultyLevel lastRatedDifficulty = questionDifficultyRateService
-                                .getQuestionDifficultyRate(questionOptional.get(), currentUser)
-                                .map(QuestionDifficultyRate::getDifficulty).orElse(null);
+        Optional<Question> questionOptional = questionRepository.findById(id);
+        if (questionOptional.isEmpty()) {
+            throw new NoSuchElementException("Question not found");
+        }
 
-                return GetQuestionDetailsResponseDto.builder()
-                                .id(question.getId())
-                                .title(question.getTitle())
-                                .content(question.getQuestionBody())
-                                .difficulty(question.getDifficulty())
-                                .selfDifficultyVote(lastRatedDifficulty)
-                                .likeCount(question.getUpvoteCount())
-                                .dislikeCount(question.getDownvoteCount())
-                                .commentCount(question.getCommentCount())
-                                .selfQuestion(selfQuestion)
-                                .selfVoted(selfVoted)
-                                .easyCount(easyCount)
-                                .mediumCount(mediumCount)
-                                .hardCount(hardCount)
-                                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
-                                .updatedAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getUpdatedAt()))
-                                .author(AuthorDto.builder()
-                                                .id(question.getAskedBy().getId())
-                                                .username(question.getAskedBy().getUsername())
-                                                .reputationPoints(question.getAskedBy().getReputationPoints())
-                                                .name(question.getAskedBy().getFirstName() + " "
-                                                                + question.getAskedBy().getLastName())
-                                                .build())
-                                .rating(0L)
-                                .tags(question.getTags().stream().map(tag -> TagDto.builder()
-                                                .id(tag.getId())
-                                                .name(tag.getTagName())
-                                                .build()).toList())
-                                .answerCount((long) question.getAnswers().size())
-                                .bookmarked(isBookmarked)
-                                .build();
+        Question question = questionOptional.get();
+        boolean selfQuestion = (currentUser != null
+                && currentUser.getId().equals(question.getAskedBy().getId()));
+        boolean isBookmarked = (currentUser != null
+                && bookmarkRepository.existsByUserAndQuestion(currentUser, question));
+        Integer selfVoted = (currentUser != null
+                && voteRepository.findByUserAndQuestion(currentUser, question).isPresent()
+                ? voteRepository.findByUserAndQuestion(currentUser, question).get()
+                        .isUpvote() ? 1 : -1
+                : 0);
+        QuestionDifficultyRateService.QuestionRateCounts record = questionDifficultyRateService.getResult(question.getId());
+        long easyCount = record.easyCount();
+        long mediumCount = record.mediumCount();
+        long hardCount = record.hardCount();
+        DifficultyLevel lastRatedDifficulty = questionDifficultyRateService
+                .getQuestionDifficultyRate(questionOptional.get(), currentUser)
+                .map(QuestionDifficultyRate::getDifficulty).orElse(null);
 
-        }
+        return GetQuestionDetailsResponseDto.builder()
+                .id(question.getId())
+                .title(question.getTitle())
+                .content(question.getQuestionBody())
+                .difficulty(question.getDifficulty())
+                .selfDifficultyVote(lastRatedDifficulty)
+                .likeCount(question.getUpvoteCount())
+                .dislikeCount(question.getDownvoteCount())
+                .commentCount(question.getCommentCount())
+                .selfQuestion(selfQuestion)
+                .selfVoted(selfVoted)
+                .easyCount(easyCount)
+                .mediumCount(mediumCount)
+                .hardCount(hardCount)
+                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
+                .updatedAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getUpdatedAt()))
+                .author(AuthorDto.builder()
+                        .id(question.getAskedBy().getId())
+                        .username(question.getAskedBy().getUsername())
+                        .reputationPoints(question.getAskedBy().getReputationPoints())
+                        .name(question.getAskedBy().getFirstName() + " "
+                                + question.getAskedBy().getLastName())
+                        .build())
+                .rating(0L)
+                .tags(question.getTags().stream().map(tag -> TagDto.builder()
+                .id(tag.getId())
+                .name(tag.getTagName())
+                .build()).toList())
+                .answerCount((long) question.getAnswers().size())
+                .bookmarked(isBookmarked)
+                .build();
 
-        public String deleteQuestion(Long id) {
-                Optional<Question> questionOptional = questionRepository.findById(id);
-                if (questionOptional.isEmpty()) {
-                        throw new NoSuchElementException("Question not found");
-                }
-                Question question = questionOptional.get();
-                questionRepository.delete(question);
-                return "Question deleted successfully";
-        }
+    }
 
-        public CreateQuestionResponseDto updateQuestion(Long id, UpdateQuestionRequestDto dto) {
-                Optional<Question> questionOptional = questionRepository.findById(id);
-                if (questionOptional.isEmpty()) {
-                        throw new NoSuchElementException("Question not found");
-                }
-                Date date = new Date();
-                Question question = questionOptional.get();
-                List<Long> tagIds = dto.getTags();
-                Set<Tag> existingTags = new HashSet<>(tagService.findAllByIdIn(tagIds));
-                question.setTitle(dto.getTitle());
-                question.setQuestionBody(dto.getContent());
-                question.setTags(existingTags);
-                question.setUpdatedAt(date);
-                question.setDifficulty(dto.getDifficulty());
-                questionRepository.save(question);
-                List<TagDto> tags = existingTags.stream().map(tag -> TagDto.builder()
-                                .id(tag.getId())
-                                .name(tag.getTagName())
-                                .build()).toList();
-                return CreateQuestionResponseDto.builder()
-                                .id(question.getId())
-                                .title(question.getTitle())
-                                .content(question.getQuestionBody())
-                                .difficulty(question.getDifficulty())
-                                .tags(tags)
-                                .author(AuthorDto.builder()
-                                                .id(question.getAskedBy().getId())
-                                                .username(question.getAskedBy().getUsername())
-                                                .reputationPoints(question.getAskedBy().getReputationPoints())
-                                                .name(question.getAskedBy().getFirstName() + " "
-                                                                + question.getAskedBy().getLastName())
-                                                .build())
-                                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
-                                .updatedAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getUpdatedAt()))
-                                .upvoteCount(question.getUpvoteCount())
-                                .downvoteCount(question.getDownvoteCount())
-                                .build();
+    public String deleteQuestion(Long id) {
+        Optional<Question> questionOptional = questionRepository.findById(id);
+        if (questionOptional.isEmpty()) {
+            throw new NoSuchElementException("Question not found");
+        }
+        Question question = questionOptional.get();
+        questionRepository.delete(question);
+        return "Question deleted successfully";
+    }
 
+    public CreateQuestionResponseDto updateQuestion(Long id, UpdateQuestionRequestDto dto) {
+        Optional<Question> questionOptional = questionRepository.findById(id);
+        if (questionOptional.isEmpty()) {
+            throw new NoSuchElementException("Question not found");
         }
+        Date date = new Date();
+        Question question = questionOptional.get();
+        List<Long> tagIds = dto.getTags();
+        Set<Tag> existingTags = new HashSet<>(tagService.findAllByIdIn(tagIds));
+        question.setTitle(dto.getTitle());
+        question.setQuestionBody(dto.getContent());
+        question.setTags(existingTags);
+        question.setUpdatedAt(date);
+        question.setDifficulty(dto.getDifficulty());
+        questionRepository.save(question);
+        List<TagDto> tags = existingTags.stream().map(tag -> TagDto.builder()
+                .id(tag.getId())
+                .name(tag.getTagName())
+                .build()).toList();
+        return CreateQuestionResponseDto.builder()
+                .id(question.getId())
+                .title(question.getTitle())
+                .content(question.getQuestionBody())
+                .difficulty(question.getDifficulty())
+                .tags(tags)
+                .author(AuthorDto.builder()
+                        .id(question.getAskedBy().getId())
+                        .username(question.getAskedBy().getUsername())
+                        .reputationPoints(question.getAskedBy().getReputationPoints())
+                        .name(question.getAskedBy().getFirstName() + " "
+                                + question.getAskedBy().getLastName())
+                        .build())
+                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
+                .updatedAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getUpdatedAt()))
+                .upvoteCount(question.getUpvoteCount())
+                .downvoteCount(question.getDownvoteCount())
+                .build();
 
-        public Page<Question> searchQuestions(
-                        String query,
-                        String tagIdsStr,
-                        DifficultyLevel difficulty,
-                        int page,
-                        int pageSize,
-                        String sortBy) {
+    }
 
-                List<Long> tagIds = null;
-                if (tagIdsStr != null && !tagIdsStr.isEmpty()) {
-                        tagIds = Arrays.stream(tagIdsStr.split(","))
-                                        .map(Long::parseLong)
-                                        .collect(Collectors.toList());
-                }
-                User currentUser;
-                try {
-                        currentUser = userContextService.getCurrentUser();
-                } catch (UnauthorizedAccessException e) {
-                        currentUser = null;
-                }
+    public Page<Question> searchQuestions(
+            String query,
+            String tagIdsStr,
+            DifficultyLevel difficulty,
+            int page,
+            int pageSize,
+            String sortBy) {
 
-                PageRequest pageable = PageRequest.of(page - 1, pageSize);
-                if (Objects.equals(sortBy, "default") || Objects.equals(sortBy, null) || Objects.equals(currentUser, null)) {
-                        return questionRepository.searchQuestions(query, tagIds, difficulty, pageable);
-                } else {
-                        List<Long> authorIds = currentUser.getFollowing().stream()
-                        .map(User::getId) // Map each User to its ID
-                        .collect(Collectors.toList()); // Collect the IDs into a List
-                        return questionRepository.searchQuestionsByRecommended(query, authorIds, tagIds, difficulty, pageable);
-                }
-                
+        List<Long> tagIds = null;
+        if (tagIdsStr != null && !tagIdsStr.isEmpty()) {
+            tagIds = Arrays.stream(tagIdsStr.split(","))
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList());
+        }
+        User currentUser;
+        try {
+            currentUser = userContextService.getCurrentUser();
+        } catch (UnauthorizedAccessException e) {
+            currentUser = null;
         }
 
-        public static QuestionSummaryDto mapToQuestionSummary(Question question) {
-                return QuestionSummaryDto.builder()
-                                .id(question.getId())
-                                .title(question.getTitle())
-                                .content(question.getQuestionBody())
-                                .difficulty(question.getDifficulty())
-                                .upvoteCount(question.getUpvoteCount())
-                                .downvoteCount(question.getDownvoteCount())
-                                .answerCount((long) question.getAnswers().size())
-                                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
-                                .author(AuthorDto.builder()
-                                                .id(question.getAskedBy().getId())
-                                                .username(question.getAskedBy().getUsername())
-                                                .name(question.getAskedBy().getFirstName() + " "
-                                                                + question.getAskedBy().getLastName())
-                                                .reputationPoints(question.getAskedBy().getReputationPoints())
-                                                .build())
-                                .tags(question.getTags().stream()
-                                                .map(tag -> TagDto.builder()
-                                                                .id(tag.getId())
-                                                                .name(tag.getTagName())
-                                                                .build())
-                                                .collect(Collectors.toList()))
-                                .build();
+        PageRequest pageable = PageRequest.of(page - 1, pageSize);
+        if (Objects.equals(sortBy, "default") || Objects.equals(sortBy, null) || Objects.equals(currentUser, null)) {
+            return questionRepository.searchQuestions(query, tagIds, difficulty, pageable);
+        } else {
+            List<Long> authorIds = currentUser.getFollowing().stream()
+                    .map(User::getId) // Map each User to its ID
+                    .collect(Collectors.toList()); // Collect the IDs into a List
+            return questionRepository.searchQuestionsByRecommended(query, authorIds, tagIds, difficulty, pageable);
         }
+
+    }
+
+    public static QuestionSummaryDto mapToQuestionSummary(Question question) {
+        return QuestionSummaryDto.builder()
+                .id(question.getId())
+                .title(question.getTitle())
+                .content(question.getQuestionBody())
+                .difficulty(question.getDifficulty())
+                .upvoteCount(question.getUpvoteCount())
+                .downvoteCount(question.getDownvoteCount())
+                .answerCount((long) question.getAnswers().size())
+                .createdAt(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(question.getCreatedAt()))
+                .author(AuthorDto.builder()
+                        .id(question.getAskedBy().getId())
+                        .username(question.getAskedBy().getUsername())
+                        .name(question.getAskedBy().getFirstName() + " "
+                                + question.getAskedBy().getLastName())
+                        .reputationPoints(question.getAskedBy().getReputationPoints())
+                        .build())
+                .tags(question.getTags().stream()
+                        .map(tag -> TagDto.builder()
+                        .id(tag.getId())
+                        .name(tag.getTagName())
+                        .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
 }
diff --git a/frontend/src/components/AnswerCard.tsx b/frontend/src/components/AnswerCard.tsx
index 2d70f05..450832f 100644
--- a/frontend/src/components/AnswerCard.tsx
+++ b/frontend/src/components/AnswerCard.tsx
@@ -1,8 +1,8 @@
+import placeholderProfile from "@/assets/placeholder_profile.png";
 import { Card } from "@/components/ui/card";
 import { ArrowRight, CornerDownRight, Star } from "lucide-react";
 import React from "react";
 import { Link } from "react-router-dom";
-import placeholderProfile from "@/assets/placeholder_profile.png";
 
 interface AnswerCardProps {
   id: number;
@@ -49,8 +49,7 @@ export const AnswerCard: React.FC<AnswerCardProps> = ({
         <div className="flex items-center justify-between">
           <Link to={`/users/${author.id}`} className="h-10 w-10">
             <img
-              src={author?.profilePicture ||
-                  placeholderProfile}
+              src={author?.profilePicture || placeholderProfile}
               alt={"Profile picture"}
               className="rounded-full object-cover"
             />
diff --git a/frontend/src/components/AnswerItem.tsx b/frontend/src/components/AnswerItem.tsx
index f750d95..3d03411 100644
--- a/frontend/src/components/AnswerItem.tsx
+++ b/frontend/src/components/AnswerItem.tsx
@@ -1,26 +1,31 @@
+import placeholderProfile from "@/assets/placeholder_profile.png";
 import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
+import { useDeleteAnswer } from "@/services/api/programmingForumComponents";
 import { AnswerDetails } from "@/services/api/programmingForumSchemas";
 import useAuthStore from "@/services/auth";
-import { ThumbsDown, ThumbsUp } from "lucide-react";
+import { ThumbsDown, ThumbsUp, Trash2 } from "lucide-react";
 import React from "react";
 import { Link } from "react-router-dom";
 import { ContentWithSnippets } from "./ContentWithSnippets";
-import placeholderProfile from "@/assets/placeholder_profile.png";
 
 interface AnswerItemProps {
   answer: AnswerDetails;
   onUpvote: () => void;
   onDownvote: () => void;
+  onDelete: () => void;
 }
 
 export const AnswerItem: React.FC<AnswerItemProps> = ({
   answer,
   onUpvote,
   onDownvote,
+  onDelete,
 }) => {
-  const { token } = useAuthStore();
+  const { token, selfProfile } = useAuthStore();
 
+  const isSelfAnswer = answer.author?.id === selfProfile?.id;
+  const { mutateAsync: deleteAnswer } = useDeleteAnswer();
   return (
     <Card className="border-none bg-neutral-100 px-6 py-8 shadow-sm">
       <div className="flex flex-col gap-4">
@@ -55,23 +60,43 @@ export const AnswerItem: React.FC<AnswerItemProps> = ({
               </div>
             )}
           </div>
-          <div className="flex flex-col items-end gap-1">
-            <Link
-              to={`/users/${answer.author?.id}`}
-              className="flex items-center gap-2"
-            >
-              <img
-                src={
-                  answer.author?.profilePicture || placeholderProfile
-                }
-                alt={"Profile picture"}
-                className="h-8 w-8 rounded-full object-cover"
-              />
-              <span className="text-sm font-medium">{answer.author?.name}</span>
-            </Link>
-            <span className="text-xs text-gray-700">
-              Answered: {new Date(answer.createdAt || "").toLocaleDateString()}
-            </span>
+          <div className="flex items-center gap-4">
+            <div className="flex flex-col items-end gap-1">
+              <Link
+                to={`/users/${answer.author?.id}`}
+                className="flex items-center gap-2"
+              >
+                <img
+                  src={answer.author?.profilePicture || placeholderProfile}
+                  alt={"Profile picture"}
+                  className="h-8 w-8 rounded-full object-cover"
+                />
+                <span className="text-sm font-medium">
+                  {answer.author?.name}
+                </span>
+              </Link>
+              <span className="text-xs text-gray-700">
+                Answered:{" "}
+                {new Date(answer.createdAt || "").toLocaleDateString()}
+              </span>
+            </div>
+            {isSelfAnswer && (
+              <Button
+                variant="destructive"
+                size="icon"
+                onClick={() => {
+                  deleteAnswer({
+                    pathParams: {
+                      answerId: answer.id,
+                    },
+                  }).then(() => {
+                    onDelete();
+                  });
+                }}
+              >
+                <Trash2 className="h-4 w-4" />
+              </Button>
+            )}
           </div>
         </div>
       </div>
diff --git a/frontend/src/components/Answers.test.tsx b/frontend/src/components/Answers.test.tsx
index 99247c3..f9ef1a6 100644
--- a/frontend/src/components/Answers.test.tsx
+++ b/frontend/src/components/Answers.test.tsx
@@ -21,6 +21,9 @@ vi.mock("@/services/api/programmingForumComponents", () => ({
   useGetQuestionAnswers: vi.fn(),
   useUpvoteAnswer: vi.fn(),
   useDownvoteAnswer: vi.fn(),
+  useDeleteAnswer: vi.fn().mockReturnValue({
+    mutateAsync: vi.fn(),
+  }),
 }));
 
 // Mock the auth store
diff --git a/frontend/src/components/Answers.tsx b/frontend/src/components/Answers.tsx
index 5c49021..a9f09af 100644
--- a/frontend/src/components/Answers.tsx
+++ b/frontend/src/components/Answers.tsx
@@ -67,11 +67,11 @@ export function Answers({ questionId }: AnswersProps) {
           answer={answer}
           onUpvote={() => handleVote(answer.id, 1)}
           onDownvote={() => handleVote(answer.id, -1)}
+          onDelete={() => refetch()}
         />
       ))}
       {answers.length === 0 && (
         <span>
-          {" "}
           This question doesn't have an answer yet. Contribute to the discussion
           by answering this question.
         </span>
diff --git a/frontend/src/components/DifficultyBar.tsx b/frontend/src/components/DifficultyBar.tsx
index 9b70276..6371ca7 100644
--- a/frontend/src/components/DifficultyBar.tsx
+++ b/frontend/src/components/DifficultyBar.tsx
@@ -80,6 +80,9 @@ export const DifficultyBar: React.FC<DifficultyBarProps> = ({
         current, //any equality -> pick higher difficulty level
       ) => (prev.count > current.count ? prev : current),
     );
+    if (counts.reduce((prev, current) => prev + current.count, 0) === 0) {
+      return "-";
+    }
     return highest.level;
   };
 
diff --git a/frontend/src/components/SubtypeCard.tsx b/frontend/src/components/SubtypeCard.tsx
index f8ac9a3..2dff6f7 100644
--- a/frontend/src/components/SubtypeCard.tsx
+++ b/frontend/src/components/SubtypeCard.tsx
@@ -18,22 +18,24 @@ export const TagSubtypeCard = React.forwardRef<
 >(({ tagSubtype }, ref) => {
   return (
     <Card
-      className="flex-1 border-none bg-neutral-100 px-6 py-8 shadow-sm"
+      className="flex flex-1 flex-col border-none bg-neutral-100 px-6 py-8 shadow-sm"
       ref={ref}
     >
-      <div className="flex flex-col gap-6">
-        {/* Subtype Name */}
-        <h1 className="text-xl font-semibold text-gray-800">
-          {tagSubtype.typeId}
-        </h1>
+      <div className="flex flex-1 flex-col justify-between ">
+        <div className="flex flex-col gap-6">
+          {/* Subtype Name */}
+          <h1 className="text-xl font-semibold text-gray-800">
+            {tagSubtype.typeId}
+          </h1>
 
-        {/* Description */}
-        <p className="text-sm text-gray-600">{tagSubtype.description}</p>
+          {/* Description */}
+          <p className="text-sm text-gray-600">{tagSubtype.description}</p>
 
-        {/* Number of Tags */}
-        <div className="flex items-center gap-2 text-sm text-gray-700">
-          <Tags className="h-5 w-5" />
-          <span>{tagSubtype.tagCount} tags</span>
+          {/* Number of Tags */}
+          <div className="flex items-center gap-2 text-sm text-gray-700">
+            <Tags className="h-5 w-5" />
+            <span>{tagSubtype.tagCount} tags</span>
+          </div>
         </div>
 
         {/* Navigation Link */}
diff --git a/frontend/src/components/TagType.tsx b/frontend/src/components/TagType.tsx
index e32f945..d1f0da8 100644
--- a/frontend/src/components/TagType.tsx
+++ b/frontend/src/components/TagType.tsx
@@ -95,10 +95,10 @@ export default function SubtypePage() {
             about and solving problems in software development.
           </p>
         );
-      case "Computer Science Term":
+      case "Computer Science Topic":
         return (
           <p>
-            A computer science term is a word or phrase that is part of the
+            A computer science topic is a word or phrase that is part of the
             technical vocabulary of computer science. These terms represent
             concepts, theories, tools, or techniques that are essential to
             understanding the field. Examples include terms like algorithm, data
@@ -134,40 +134,39 @@ export default function SubtypePage() {
 
   return (
     <div className="container py-8">
-          {/* Header */}
-          <h1 className="mb-4 text-4xl font-bold text-gray-800">{tagTypeId}</h1>
-
-          {/* Render the description based on typeId */}
-          <div className="mb-6 text-lg text-gray-700">{description}</div>
-
-          {/* Tags in this type */}
-          <h2 className="mb-4 text-2xl font-semibold text-gray-800">
-            Tags in Category
-          </h2>
-
-          {/* Infinite Scroll for displaying Related Tags */}
-          <div className="grid grid-cols-3 gap-4">
-            <InfiniteScroll
-              next={next}
-              hasMore={
-                searchResultData.totalItems
-                  ? searchResultData.totalItems > pageSize
-                  : false
-              }
-              isLoading={isLoading}
-            >
-                {tags?.map((tag) => <TagCard key={tag.tagId} tag={tag} />)
-              }
-            </InfiniteScroll>
-            {isLoading && (
-            <div className="col-span-3 flex w-full items-center justify-center">
-              <Loader2
-                aria-label="Loading"
-                className="h-16 w-16 animate-spin text-primary"
-              />
-            </div>
-          )}
+      {/* Header */}
+      <h1 className="mb-4 text-4xl font-bold text-gray-800">{tagTypeId}</h1>
+
+      {/* Render the description based on typeId */}
+      <div className="mb-6 text-lg text-gray-700">{description}</div>
+
+      {/* Tags in this type */}
+      <h2 className="mb-4 text-2xl font-semibold text-gray-800">
+        Tags in Category
+      </h2>
+
+      {/* Infinite Scroll for displaying Related Tags */}
+      <div className="grid grid-cols-3 gap-4">
+        <InfiniteScroll
+          next={next}
+          hasMore={
+            searchResultData.totalItems
+              ? searchResultData.totalItems > pageSize
+              : false
+          }
+          isLoading={isLoading}
+        >
+          {tags?.map((tag) => <TagCard key={tag.tagId} tag={tag} />)}
+        </InfiniteScroll>
+        {isLoading && (
+          <div className="col-span-3 flex w-full items-center justify-center">
+            <Loader2
+              aria-label="Loading"
+              className="h-16 w-16 animate-spin text-primary"
+            />
           </div>
+        )}
+      </div>
     </div>
   );
 }
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 8b14640..ef7de35 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -104,7 +104,7 @@ blockquote {
 }
 
 code {
-  @apply relative rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold;
+  @apply relative rounded px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold;
 }
 
 @layer base {
diff --git a/frontend/src/routes/home.tsx b/frontend/src/routes/home.tsx
index e8e2dbe..7217df9 100644
--- a/frontend/src/routes/home.tsx
+++ b/frontend/src/routes/home.tsx
@@ -5,7 +5,7 @@ export function IndexRoute() {
     <>
       <div className="container flex flex-col gap-2 py-8">
         <h1 className="mb-4 text-4xl font-bold">
-          Welcome to Programming Languages Forum
+          Welcome to the Programming Languages Forum
         </h1>
         <Feed />
       </div>
diff --git a/frontend/src/routes/question.tsx b/frontend/src/routes/question.tsx
index 2fd8e29..2f9d796 100644
--- a/frontend/src/routes/question.tsx
+++ b/frontend/src/routes/question.tsx
@@ -27,7 +27,14 @@ import {
 } from "@/services/api/programmingForumComponents";
 import useAuthStore from "@/services/auth";
 import { convertTagToTrack, useExercismSearch } from "@/services/exercism";
-import { Flag, MessageSquare, ThumbsDown, ThumbsUp, Trash } from "lucide-react";
+import {
+  Flag,
+  MessageSquare,
+  Pencil,
+  ThumbsDown,
+  ThumbsUp,
+  Trash,
+} from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 import { Link, useParams } from "react-router-dom";
 
@@ -112,9 +119,14 @@ export default function QuestionPage() {
   const titleRef = useRef<HTMLInputElement>(null);
   const contentRef = useRef<HTMLTextAreaElement>(null);
 
-  const [tags, setTags] = useState<number[]>(
-    question.tags?.map((tag) => Number(tag.id)) || [],
-  ); // Tag IDs state
+  const [tags, setTags] = useState<number[]>([]);
+
+  useEffect(() => {
+    if (!isEditing && question.tags) {
+      setTags(question.tags.map((t) => Number(t.id)));
+    }
+  }, [question?.tags, isEditing]);
+
   const [availableTags, setAvailableTags] = useState<
     { tagId: string; name: string }[]
   >([]); // Available tags
@@ -220,6 +232,15 @@ export default function QuestionPage() {
                 }}
               />
             )}
+            {!isEditing && selfProfile?.id === question.author.id && (
+              <Button
+                variant="default"
+                onClick={() => setIsEditing(true)}
+                aria-label="Edit question"
+              >
+                <Pencil className="h-5 w-5" />
+              </Button>
+            )}
           </div>
         </div>
 
@@ -294,6 +315,7 @@ export default function QuestionPage() {
                   value: String(tag.tagId),
                   label: tag.name || "Loading...",
                 }))}
+                defaultValue={tags.map((tag) => String(tag))}
                 value={tags.map((tag) => String(tag))}
                 onValueChange={(selectedIds) => {
                   const selectedTags = selectedIds.map((id) => Number(id)); // Convert back to numbers
@@ -318,8 +340,8 @@ export default function QuestionPage() {
 
         {/* Question Content */}
         {isEditing ? (
-          <div>
-            <div className="flex gap-2">
+          <>
+            <div className="my-4 flex gap-2">
               <Button
                 variant={!isPreviewMode ? "default" : "outline"}
                 onClick={() => setIsPreviewMode(false)}
@@ -334,25 +356,26 @@ export default function QuestionPage() {
               </Button>
             </div>
             {isPreviewMode ? (
-              <div className="min-h-[200px] rounded-lg border border-gray-300 bg-white p-4">
+              <div className="my-4 min-h-[200px] rounded-lg border border-gray-300 bg-white p-4">
                 <ContentWithSnippets
                   content={contentRef.current?.value || ""}
                 />
               </div>
             ) : (
               <Textarea
+                className="my-4"
                 ref={contentRef}
                 defaultValue={question.content}
                 placeholder="Enter question content..."
               />
             )}
-          </div>
+          </>
         ) : (
           <ContentWithSnippets content={question.content} />
         )}
 
         {/* Edit and Save Buttons */}
-        {isEditing ? (
+        {isEditing && (
           <div className="flex gap-4">
             <Button onClick={saveChanges} disabled={isPending}>
               {isPending ? "Saving..." : "Save"}
@@ -361,12 +384,6 @@ export default function QuestionPage() {
               Cancel
             </Button>
           </div>
-        ) : (
-          selfProfile?.id === question.author.id && (
-            <Button variant="default" onClick={() => setIsEditing(true)}>
-              Edit Question
-            </Button>
-          )
         )}
 
         {/* Difficulty Bar */}
diff --git a/mobile/components/QuestionCard.tsx b/mobile/components/QuestionCard.tsx
index a8009d7..1d22532 100644
--- a/mobile/components/QuestionCard.tsx
+++ b/mobile/components/QuestionCard.tsx
@@ -1,9 +1,14 @@
+import placeholderProfile from "@/assets/images/placeholder_profile.png";
 import { Card, HStack, Icon, Image, Text, View } from "@/components/ui";
 import { DifficultyLevel } from "@/services/api/programmingForumSchemas";
 import { Link } from "expo-router";
-import { ArrowRight, MessageSquare, Star, StarsIcon } from "lucide-react-native";
+import {
+  ArrowRight,
+  MessageSquare,
+  Star,
+  StarsIcon,
+} from "lucide-react-native";
 import React from "react";
-import placeholderProfile from "@/assets/images/placeholder_profile.png";
 
 interface QuestionCardProps {
   id: string;
@@ -36,11 +41,11 @@ export const QuestionCard: React.FC<QuestionCardProps> = ({
 }) => {
   return (
     <Card
-      className={`rounded-lg border-none text-card-foreground flex flex-1 px-6 py-8 shadow-sm ${
+      className={`rounded-lg border-none text-card-foreground flex flex-1 w-full px-6 py-8 shadow-sm ${
         highlighted ? "bg-blue-100 border-blue-500" : "bg-neutral-150"
       }`}
     >
-      <View className="flex flex-col gap-6">
+      <View className="flex flex-col gap-6 w-full">
         {(highlighted || answerCount === 0) && (
           <HStack className="gap-4">
             {highlighted && (
@@ -48,7 +53,7 @@ export const QuestionCard: React.FC<QuestionCardProps> = ({
                 Beginner Friendly
               </Text>
             )}
-            
+
             {/* Unanswered notification with background */}
             {answerCount === 0 && (
               <Text className="text-xs font-semibold text-red-600 bg-red-200 p-1 rounded-lg">
@@ -56,19 +61,25 @@ export const QuestionCard: React.FC<QuestionCardProps> = ({
               </Text>
             )}
           </HStack>
-          )
-        }
+        )}
 
         {author && (
           <HStack className="flex items-center gap-2">
             <Link href={`/users/${author.id}`} className="h-10 w-10">
               <Image
-                source={author.profilePicture ? {uri: author.profilePicture} : placeholderProfile}
+                source={
+                  author.profilePicture
+                    ? { uri: author.profilePicture }
+                    : placeholderProfile
+                }
                 alt={author.name || "Author"}
                 className="h-full w-full rounded-full object-cover"
               />
             </Link>
-            <Link href={`/users/${author.id}`} className="text-sm font-semibold">
+            <Link
+              href={`/users/${author.id}`}
+              className="text-sm font-semibold"
+            >
               {author?.name}
             </Link>
           </HStack>