diff --git a/includes/ui-helpers.php b/includes/ui-helpers.php
deleted file mode 100644
index 5ebfc92..0000000
--- a/includes/ui-helpers.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * UI Helper functions for University-DMS
- */
-
-/**
- * Returns the image path for a university or a placeholder if not found.
- * 
- * @param array $university The university data array
- * @return string The image path or placeholder URL
- */
-function getUniversityImagePath($university) {
-    if (!empty($university['image_url']) && file_exists($university['image_url'])) {
-        return $university['image_url'];
-    }
-    
-    // Map university names to their exact filenames in the images/universities folder
-    $uni_name = isset($university['name']) ? $university['name'] : '';
-    $static_map = [
-        'University of Colombo' => 'images/universities/colombo.jpg',
-        'University of Peradeniya' => 'images/universities/universityofperadeniya.jfif',
-        'University of Sri Jayewardenepura' => 'images/universities/universityofsrijayewardenepura.jpg',
-        'University of Kelaniya' => 'images/universities/universityofkelaniya.webp',
-        'University of Moratuwa' => 'images/universities/universityofmoratuwa.jpg',
-        'University of Jaffna' => 'images/universities/universityofjaffna.jpg', // also has .jpeg
-        'Eastern University' => 'images/universities/easternuniversityofmoratuwa.jpg',
-        'South Eastern University of Sri Lanka' => 'images/universities/seusl.jpg',
-        'Rajarata University of Sri Lanka' => 'images/universities/rajaratauniversity.jpg',
-        'Wayamba University of Sri Lanka' => 'images/universities/WayambaUniversity.jpg',
-        'Sabaragamuwa University of Sri Lanka' => 'images/universities/sabaragamuwa.jpg',
-        'Uva Wellassa University' => 'images/universities/uwawellassa.jpg',
-        'University of Ruhuna' => 'images/universities/universityofruhuna.jpg',
-        'University of Vavuniya, Sri Lanka' => 'images/universities/University_of_Vavuniya.png',
-        'University of Vavuniya' => 'images/universities/University_of_Vavuniya.png',
-        'Gampaha Wickramarachchi University of Indigenous Medicine, Sri Lanka' => 'images/universities/Gampaha Wickramarachchi University of Indigenous Medicine, Sri Lanka.JPG',
-        'Gampaha Wickramarachchi University of Indigenous Medicine' => 'images/universities/Gampaha Wickramarachchi University of Indigenous Medicine, Sri Lanka.JPG',
-        'University of Trincomalee' => 'images/universities/university_of_trincomalee.jpg',
-        'Trincomalee Campus, Eastern University, Sri Lanka' => 'images/universities/university_of_trincomalee.jpg',
-        'Swami Vipulananda Institute of Aesthetic Studies' => 'images/universities/Swami_Vipulananda_Institut_of_Aesthetic_Studies.jpg',
-        'Swami Vipulananda Institute of Aesthetic Studies, Eastern University, Sri Lanka' => 'images/universities/Swami_Vipulananda_Institut_of_Aesthetic_Studies.jpg',
-    ];
-    
-    if (isset($static_map[$uni_name]) && file_exists($static_map[$uni_name])) {
-        return $static_map[$uni_name];
-    }
-
-    if (!empty($university['image']) && file_exists($university['image'])) {
-        return $university['image'];
-    }
-
-    // Check if an image exists in the uploads folder based on ID
-    $id = isset($university['id']) ? $university['id'] : 0;
-    $localImagePath = "uploads/universities/uni_{$id}.jpg";
-
-    if (file_exists($localImagePath)) {
-        return $localImagePath;
-    }
-
-    // If no valid image exists, return the placeholder pattern image
-    return "images/universities/placeholder.jpg";
-}
-
-/**
- * Returns the university location or a default string.
- * 
- * @param array $university The university data array
- * @return string The location
- */
-function getUniversityLocation($university) {
-    return !empty($university['location']) ? $university['location'] : 'Sri Lanka';
-}
-
-/**
- * Returns a truncated description of the university.
- * 
- * @param array $university The university data array
- * @param int $limit The character limit
- * @return string The truncated description
- */
-function getUniversityDescription($university, $limit = 200) {
-    $desc = !empty($university['description']) ? $university['description'] : 'Discover programs and opportunities at this institution.';
-    
-    if (strlen($desc) > $limit) {
-        $desc = substr($desc, 0, $limit) . '...';
-    }
-    
-    return $desc;
-}
-
-/**
- * Returns the university type (Public/Private/etc).
- * 
- * @param array $university The university data array
- * @return string The type
- */
-function getUniversityType($university) {
-    return !empty($university['type']) ? $university['type'] : 'University';
-}
diff --git a/universities.php b/universities.php
index 2f87958..13890d0 100644
--- a/universities.php
+++ b/universities.php
@@ -1,7 +1,6 @@
 <?php
 require_once 'includes/db.php';
 require_once 'includes/require_user_details.php';
-require_once 'includes/ui-helpers.php';
 
 $pageTitle = 'Universities';
 $pageStyles = ['css/pages/universities.css'];
@@ -68,6 +67,30 @@
     return $item['id'];
 }, array_slice($universities, 0, 2));
 
+$universityImageMap = [
+    'University of Colombo' => 'images/universities/colombo.jpg',
+    'University of Peradeniya' => 'images/universities/universityofperadeniya.jfif',
+    'University of Sri Jayewardenepura' => 'images/universities/universityofsrijayewardenepura.jpg',
+    'University of Kelaniya' => 'images/universities/universityofkelaniya.webp',
+    'University of Moratuwa' => 'images/universities/universityofmoratuwa.jpg',
+    'University of Jaffna' => 'images/universities/universityofjaffna.jpg',
+    'Eastern University' => 'images/universities/easternuniversityofmoratuwa.jpg',
+    'South Eastern University of Sri Lanka' => 'images/universities/seusl.jpg',
+    'Rajarata University of Sri Lanka' => 'images/universities/rajaratauniversity.jpg',
+    'Wayamba University of Sri Lanka' => 'images/universities/WayambaUniversity.jpg',
+    'Sabaragamuwa University of Sri Lanka' => 'images/universities/sabaragamuwa.jpg',
+    'Uva Wellassa University' => 'images/universities/uwawellassa.jpg',
+    'University of Ruhuna' => 'images/universities/universityofruhuna.jpg',
+    'University of Vavuniya, Sri Lanka' => 'images/universities/University_of_Vavuniya.png',
+    'University of Vavuniya' => 'images/universities/University_of_Vavuniya.png',
+    'Gampaha Wickramarachchi University of Indigenous Medicine, Sri Lanka' => 'images/universities/Gampaha Wickramarachchi University of Indigenous Medicine, Sri Lanka.JPG',
+    'Gampaha Wickramarachchi University of Indigenous Medicine' => 'images/universities/Gampaha Wickramarachchi University of Indigenous Medicine, Sri Lanka.JPG',
+    'University of Trincomalee' => 'images/universities/university_of_trincomalee.jpg',
+    'Trincomalee Campus, Eastern University, Sri Lanka' => 'images/universities/university_of_trincomalee.jpg',
+    'Swami Vipulananda Institute of Aesthetic Studies' => 'images/universities/Swami_Vipulananda_Institut_of_Aesthetic_Studies.jpg',
+    'Swami Vipulananda Institute of Aesthetic Studies, Eastern University, Sri Lanka' => 'images/universities/Swami_Vipulananda_Institut_of_Aesthetic_Studies.jpg',
+];
+
 include 'includes/header.php';
 ?>
 <style>
@@ -112,16 +135,47 @@ class="search-input"
         <?php if ($universities): ?>
             <div class="university-grid">
                 <?php foreach ($universities as $university): ?>
-                    <?php $image = getUniversityImagePath($university); ?>
+                    <?php
+                    $image = 'images/universities/placeholder.jpg';
+                    $rawImage = trim((string) ($university['image_url'] ?? $university['image'] ?? ''));
+                    $candidates = [];
+
+                    if ($rawImage !== '') {
+                        $rawImage = str_replace('\\', '/', $rawImage);
+                        $candidates[] = $rawImage;
+
+                        $baseName = basename($rawImage);
+                        if ($baseName !== '') {
+                            $candidates[] = 'images/universities/' . $baseName;
+                            $candidates[] = 'images/' . $baseName;
+                        }
+                    }
+
+                    if (!empty($university['name']) && isset($universityImageMap[$university['name']])) {
+                        $candidates[] = $universityImageMap[$university['name']];
+                    }
+
+                    foreach (array_unique($candidates) as $candidate) {
+                        if ($candidate !== '' && file_exists($candidate)) {
+                            $image = $candidate;
+                            break;
+                        }
+                    }
+
+                    $location = !empty($university['location']) ? $university['location'] : 'Sri Lanka';
+
+                    $description = !empty($university['description'])
+                        ? $university['description']
+                        : 'Discover programs and opportunities at this institution.';
+                    if (strlen($description) > 200) {
+                        $description = substr($description, 0, 200) . '...';
+                    }
+                    ?>
                     <article class="university-card reveal-on-scroll" data-streams="<?php echo htmlspecialchars($university['stream_list']); ?>">
                         <div class="university-image">
-                            <?php if ($image): ?>
-                                <img src="<?php echo htmlspecialchars($image, ENT_QUOTES, 'UTF-8'); ?>" loading="lazy" alt="<?php echo htmlspecialchars($university['name']); ?>">
-                            <?php else: ?>
-                                <div class="university-image university-image--placeholder"></div>
-                            <?php endif; ?>
+                            <img src="<?php echo htmlspecialchars($image, ENT_QUOTES, 'UTF-8'); ?>" loading="lazy" alt="<?php echo htmlspecialchars($university['name']); ?>">
                             <div class="image-overlay">
-                                <div class="location-tag"><i class="fa-solid fa-location-dot" aria-hidden="true"></i> <?php echo htmlspecialchars(getUniversityLocation($university)); ?></div>
+                                <div class="location-tag"><i class="fa-solid fa-location-dot" aria-hidden="true"></i> <?php echo htmlspecialchars($location); ?></div>
                                 <?php if (!empty($university['type'])): ?>
                                     <span class="type-badge type-<?php echo strtolower($university['type']); ?>"><?php echo htmlspecialchars($university['type']); ?></span>
                                 <?php else: ?>
@@ -131,7 +185,7 @@ class="search-input"
                             </div>
                         </div>
                         <div class="university-content">
-                            <p><?php echo htmlspecialchars(getUniversityDescription($university)); ?></p>
+                            <p><?php echo htmlspecialchars($description); ?></p>
                             <div class="pills">
                                 <span class="pill degree-pill"><?php echo $university['degree_count']; ?> Degrees</span>
                             <?php if (!empty($university['stream_list']) && $university['stream_list'] !== 'All'): ?>
diff --git a/university.php b/university.php
index 1e83356..0889213 100644
--- a/university.php
+++ b/university.php
@@ -1,6 +1,5 @@
 <?php
 require_once 'includes/db.php';
-require_once 'includes/ui-helpers.php';
 
 $pageStyles = ['css/pages/universities.css'];
 
@@ -89,6 +88,16 @@
     }
 }
 
+$heroDescription = '';
+if ($university) {
+    $heroDescription = !empty($university['description'])
+        ? $university['description']
+        : 'Discover programs and opportunities at this institution.';
+    if (strlen($heroDescription) > 320) {
+        $heroDescription = substr($heroDescription, 0, 320) . '...';
+    }
+}
+
 include 'includes/header.php';
 ?>
 <?php if ($university): ?>
@@ -96,7 +105,7 @@
         <div class="container">
             <div class="hero-text">
                 <h1><?php echo htmlspecialchars($university['name']); ?></h1>
-                <p class="page-hero-meta"><?php echo htmlspecialchars(getUniversityDescription($university, 320)); ?></p>
+                <p class="page-hero-meta"><?php echo htmlspecialchars($heroDescription); ?></p>
             </div>
         </div>
     </section>