diff --git a/ui/src/components/Callendar/index.jsx b/ui/src/components/Callendar/index.jsx
index 4fa9b80..385de9c 100644
--- a/ui/src/components/Callendar/index.jsx
+++ b/ui/src/components/Callendar/index.jsx
@@ -15,7 +15,7 @@ import {
 
 const Callendar = ({ className, lastTimeReseted, currentCouterValue }) => {
   const [date, setDate] = React.useState({
-    from: lastTimeReseted || new Date(2024, 4, 13),
+    from: lastTimeReseted ? new Date(lastTimeReseted) : new Date(2024, 4, 13),
     to: addDays(new Date(2024, 4, 13), currentCouterValue),
   });
   return (
@@ -45,7 +45,12 @@ const Callendar = ({ className, lastTimeReseted, currentCouterValue }) => {
             )}
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="start">
+        <PopoverContent
+          className="w-auto p-0"
+          align="center"
+          side="top"
+          sideOffset={10}
+        >
           <Calendar
             initialFocus
             mode="range"