diff --git a/src/components/Common/Arrow.jsx b/src/components/Common/Arrow.jsx
index 6087cc5..6ca971e 100644
--- a/src/components/Common/Arrow.jsx
+++ b/src/components/Common/Arrow.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import styles from './Arrow.module.css';
 
-export const ClosedArrow = ({ isOpen, direction }) => {
+export const ClosedArrow = ({ isOpen, direction, color  }) => {
     let arrowClasses = [styles.closedArrow]; // Start with an array of classes
     if (isOpen) arrowClasses.push(styles.open);
     if (direction === 'left') arrowClasses.push(styles.left);
@@ -19,13 +19,13 @@ export const ClosedArrow = ({ isOpen, direction }) => {
         >
             <path
                 d="M4 4L7.5 0H0.5L4 4Z"
-                fill="#949494"
+                fill={color || "#949494"}
             />
         </svg>
     );
 };
 
-export const OpenArrow = ({ isOpen, direction }) => {
+export const OpenArrow = ({ isOpen, direction, color }) => {
     let arrowClasses = [styles.openArrow]; // Start with an array of classes
     if (isOpen) arrowClasses.push(styles.open);
     if (direction === 'left') arrowClasses.push(styles.left);
@@ -43,7 +43,7 @@ export const OpenArrow = ({ isOpen, direction }) => {
         >
             <path 
                 d="M8 10l4 4 4-4" 
-                stroke="#949494" 
+                stroke={color || "#949494"}
                 strokeWidth="2" 
                 fill="none"
             />
diff --git a/src/components/Sidebar/CustomDropDown.jsx b/src/components/Sidebar/CustomDropDown.jsx
index c512f33..70ab116 100644
--- a/src/components/Sidebar/CustomDropDown.jsx
+++ b/src/components/Sidebar/CustomDropDown.jsx
@@ -4,19 +4,33 @@ import { OpenArrow } from '../Common/Arrow';
 
 export const CustomDropdown = ({ id, selectedValue, options, onSelect, placeholder, onSelectionChange }) => {
     const [isOpen, setIsOpen] = useState(false);
+    const [lastSelected, setLastSelected] = useState(options[0]);
     const dropdownRef = useRef(null);
+    const arrowColor = isOpen ? "rgba(56,171,223,0.35)" : "#949494";
+
     const toggleDropdown = () => setIsOpen(!isOpen);
+
+    /** Peforms the selected action type when used as a Drop-down */
     const handleOptionSelect = (option) => {
         onSelect(option.label);
         setIsOpen(false);
-
+        setLastSelected(option); 
         if (onSelectionChange) {
-            // Call the passed function with the selected value
             onSelectionChange(option.value); 
         }
     };
 
-    // Close dropdown when clicking outside
+    /** Peforms the selected action type when used as a Button */
+    const handleDefaultAction = () => {
+        if (lastSelected) {
+            onSelect(lastSelected.label);
+            if (onSelectionChange) {
+                onSelectionChange(lastSelected.value);
+            }
+        }
+    };
+
+    /** Handles navigate away from the drop-down control */
     useEffect(() => {
         const handleClickOutside = (event) => {
             if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
@@ -35,11 +49,15 @@ export const CustomDropdown = ({ id, selectedValue, options, onSelect, placehold
 
     return (
         <div className={`${styles['custom-dropdown']} ${isOpen ? styles.open : ''}`} ref={dropdownRef}>
-            <div className={styles['dropdown-selected']} onClick={toggleDropdown}>
-                <span>{placeholder}</span>
+            <div className={styles['dropdown-selected']} onClick={handleDefaultAction}>
+                <span>{placeholder}</span>  
                 <span className={styles['vertical-line']}></span>
-                {/* SVG Arrow */}
-                <OpenArrow isOpen={isOpen} />
+                <div className={styles['arrow-container']} onClick={(e) => {
+                    e.stopPropagation(); 
+                    toggleDropdown();
+                }}>
+                    <OpenArrow isOpen={isOpen} color={arrowColor} />
+                </div>
             </div>
             <div className={`${styles['dropdown-options']} ${isOpen ? styles.open : ''}`}>
                 {options.map((option, index) => (
diff --git a/src/components/Sidebar/CustomDropDown.module.css b/src/components/Sidebar/CustomDropDown.module.css
index 82b0652..761ecfc 100644
--- a/src/components/Sidebar/CustomDropDown.module.css
+++ b/src/components/Sidebar/CustomDropDown.module.css
@@ -1,55 +1,64 @@
-/* Custom Select Component Stylesheet */
 .custom-dropdown {
     position: relative;
     cursor: pointer;
     font-size: 14px;
-    border-bottom: 2px solid transparent;
-    transition: border-bottom-color 0.3s ease;
     margin-top: 15px;
+    background-color: transparent;
+    border-radius: 4px;
+    transition: box-shadow 0.3s ease-out; 
 }
 
-.custom-dropdown.open,
-.custom-dropdown:hover {
-    border-bottom-color: #38abdf;
+/* Applies shadow when dropdown is hovered */
+.custom-dropdown:not(:has(.arrow-container:hover)):hover {
+    box-shadow: 0 0 4px rgba(255,255,255,0.15);
 }
 
-.custom-dropdown.open::after,
-.custom-dropdown::after {
-    /* Create a pseudo-element for the 5px thick rectangle */
-    content: '';
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: -7px;    /* Position it just below the 1px border */
-    height: 5px;
-    background-color: #40687a;    /* Darker blue color */
-    opacity: 0;    /* Start with an invisible border */
-    transition: opacity 0.3s ease;    /* Transition for the opacity */
+/* Differentiate the active state with a more intense shadow */
+.custom-dropdown:not(:has(.arrow-container:hover)):active {
+    box-shadow: 0 0 4px rgba(255,255,255,0.25);
 }
 
-.custom-dropdown:hover::after {
-    opacity: 1;
+/* Custom-dropdown: Blue color when the control is 'active' or 'selected' */
+.custom-dropdown.open{
+    box-shadow: 0 0 4px rgba(56,171,223,0.35);
 }
 
-.custom-dropdown.open:not(:hover) {
-    border-bottom-color: white;
+/* Dropdown-selected: Blue color when the control is 'active' or 'selected' */
+.custom-dropdown.open .dropdown-selected{
+    border: solid 1px rgba(56,171,223,0.35); 
 }
 
-.custom-dropdown.open:not(:hover)::after {
-    background-color: #808080;
-    opacity: 1;
+/* Vertical line: Blue color when the control is 'active' or 'selected' */
+.custom-dropdown.open .vertical-line{
+    background-color: rgba(56,171,223,0.35); 
+}
+
+.arrow-container {
+    padding: 6px;
+    border-radius: 4px;
+    transition: box-shadow 0.3s ease-out;
+}
+
+/* Applies shadow when arrow box is hovered */
+.arrow-container:hover {
+    box-shadow: 0 0 4px rgba(255,255,255,0.15) !important;
+}
+
+/* Differentiate the active state with a more intense shadow */
+.arrow-container:active {
+    box-shadow: 0 0 4px rgba(255,255,255,0.25) !important;
 }
 
 .dropdown-selected {
-    display: flex;    /* Use flexbox layout */
-    justify-content: space-between;    /* Space between items */
-    align-items: center;    /* Align items vertically */
-    padding: 10px;
-    padding-left: 14px;
-    padding-right: 6px;
+    display: flex;   
+    justify-content: space-between;    
+    align-items: center;    
+    padding: 0px;
+    padding-left: 10px;
     background-color: transparent;
     border-radius: 4px;
     border: solid 1px #9B9B9B;
+    transition: background-color 0.3s ease;
 }
 
 .dropdown-selected:hover .vertical-line{
@@ -61,11 +70,9 @@
     border: solid 1px transparent;
 }
 
-/* Style for .dropdown-selected when active (e.g., when clicked) */
 .dropdown-selected:active {
-    background-color: #1e1e1e; /* Change background color when active */
-    color: #fff; /* Change text color when active */
-    /* Add any other styles you want for the active state */
+    background-color: #1e1e1e; 
+    color: #fff; 
 }
 
 .dropdown-options {
@@ -76,11 +83,17 @@
     background-color: #535353;
     display: none;
     margin-top: 3px;
+    border-radius: 4px;
     z-index: 1000;
 }
 
+.dropdown-options:hover {
+    box-shadow: 0 0 4px rgba(255,255,255,0.25) !important;
+}
+
 .dropdown-options.open {
     display: block;
+    box-shadow: 0 0 4px rgba(56,171,223,0.35);
 }
 
 .dropdown-option{
@@ -93,11 +106,11 @@
 
 .vertical-line {
     position: absolute;
-    right: 35px;
+    right: 37px;
     top: 0;
     bottom: 0;
-    width: 1px; /* Adjust the width as needed */
-    height: 100%; /* Vertically extend the line to match the container */
-    background-color: #9B9B9B; /* Adjust the color as needed */
-    margin: 0 px; /* Add spacing to separate the line from text and arrow */
-}
+    width: 1px; 
+    height: 100%;
+    background-color: #9B9B9B; 
+    margin: 0px; 
+}
\ No newline at end of file
diff --git a/src/components/Sidebar/Sidebar.jsx b/src/components/Sidebar/Sidebar.jsx
index 4287760..8faf8d9 100644
--- a/src/components/Sidebar/Sidebar.jsx
+++ b/src/components/Sidebar/Sidebar.jsx
@@ -13,7 +13,7 @@ export function Sidebar({ onItemSelect, selectedSidebarItem })
 
     const isSelected = (item) => selectedSidebarItem === item;
 
-    // Trigger the backend command based on the drop-down value
+    /**Trigger the backend command based on the drop-down value */ 
     const setSelectedValue = (value) => {
         sideBarCommand(value);
     };