diff --git a/components/ColorPicker/ColorPicker.css b/components/ColorPicker/ColorPicker.css
index cb912c2..3b6d40a 100644
--- a/components/ColorPicker/ColorPicker.css
+++ b/components/ColorPicker/ColorPicker.css
@@ -1,15 +1,7 @@
-.color-picker {
-  margin-left: 8px;
-}
-
 .color-picker div {
   display: flex !important;
 }
 
-label#color-picker-label {
-  padding-left: 10px;
-}
-
 .color-circle {
   width: 12px;
   height: 12px;
diff --git a/components/ColorPicker/ColorPicker.tsx b/components/ColorPicker/ColorPicker.tsx
index 3516f52..2485272 100644
--- a/components/ColorPicker/ColorPicker.tsx
+++ b/components/ColorPicker/ColorPicker.tsx
@@ -6,22 +6,7 @@ import {
   SelectChangeEvent,
 } from "@mui/material";
 import { FunctionComponent } from "react";
-
-export const Colors = {
-  Gray: "#212529",
-  Red: "#c92a2a",
-  Pink: "#a61e4d",
-  Grape: "#862e9c",
-  Violet: "#5f3dc4",
-  Indigo: "#364fc7",
-  Blue: "#1864ab",
-  Cyan: "#0b7285",
-  Teal: "#087f5b",
-  Green: "#2b8a3e",
-  Lime: "#5c940d",
-  Yellow: "#e67700",
-  Orange: "#d9480f",
-};
+import { Colors } from "../../utils/colors";
 
 interface ColorPickerProps {
   selectedColor: string;
@@ -33,7 +18,7 @@ const ColorPicker: FunctionComponent<ColorPickerProps> = ({
   onChangeColor,
 }) => {
   return (
-    <FormControl sx={{ m: 1, minWidth: 120 }}>
+    <FormControl sx={{ my: 1, minWidth: 120 }} required>
       <InputLabel id="color-picker-label">Color</InputLabel>
       <Select
         size="small"
diff --git a/components/CoordinatesList/CoordinatesList.tsx b/components/CoordinatesList/CoordinatesList.tsx
index b6c930d..1bd5cf8 100644
--- a/components/CoordinatesList/CoordinatesList.tsx
+++ b/components/CoordinatesList/CoordinatesList.tsx
@@ -1,14 +1,16 @@
-import { Circle, ExpandLess, ExpandMore } from "@mui/icons-material";
+import { Circle, Edit, ExpandLess, ExpandMore } from "@mui/icons-material";
 import {
   Collapse,
   Container,
+  Icon,
+  IconButton,
   List,
-  ListItemButton,
-  ListItemIcon,
   ListItemText,
+  Typography,
 } from "@mui/material";
-import { Fragment, FunctionComponent, useState } from "react";
+import { Fragment, FunctionComponent, useEffect, useState } from "react";
 import { IEntity } from "../../models/IEntity";
+import EntityDialog from "../EntityDialog/EntityDialog";
 
 interface CoordinatesListProps {
   entity: IEntity;
@@ -16,24 +18,63 @@ interface CoordinatesListProps {
 const CoordinatesList: FunctionComponent<CoordinatesListProps> = ({
   entity,
 }) => {
-  const [open, setOpen] = useState<boolean>(false);
-  const { id, color, coordinates } = entity;
+  const [label, setLabel] = useState<string>("");
+  const [color, setColor] = useState<string>("");
+  const [isCollapseOpen, setIsCollapseOpen] = useState<boolean>(false);
+  const [isDialogOpen, setIsDialogOpen] = useState<boolean>(false);
+  const { coordinates } = entity;
+
+  useEffect(() => {
+    setLabel(entity.id);
+    setColor(entity.color);
+  }, [entity]);
 
   return (
     <Fragment>
-      <ListItemButton
-        onClick={() => {
-          setOpen(!open);
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          alignItems: "center",
+          backgroundColor: "#f1f3f5",
         }}
-        sx={{ backgroundColor: "#f1f3f5" }}
       >
-        <ListItemIcon sx={{ minWidth: 0, mr: 2, color }}>
-          <Circle fontSize="small" />
-        </ListItemIcon>
-        <ListItemText primary={id} />
-        {open ? <ExpandLess /> : <ExpandMore />}
-      </ListItemButton>
-      <Collapse in={open} timeout="auto" unmountOnExit>
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "row",
+            alignItems: "center",
+          }}
+        >
+          <Icon sx={{ display: "flex", mx: 1, color }}>
+            <Circle fontSize="small" />
+          </Icon>
+
+          <Typography component="span" variant="body1">
+            {label}
+          </Typography>
+        </div>
+
+        <div>
+          <IconButton
+            onClick={() => {
+              setIsDialogOpen(true);
+            }}
+            sx={{ backgroundColor: "#f1f3f5" }}
+          >
+            <Edit fontSize="small" />
+          </IconButton>
+          <IconButton
+            onClick={() => {
+              setIsCollapseOpen(!isCollapseOpen);
+            }}
+            sx={{ backgroundColor: "#f1f3f5" }}
+          >
+            {isCollapseOpen ? <ExpandLess /> : <ExpandMore />}
+          </IconButton>
+        </div>
+      </div>
+      <Collapse in={isCollapseOpen} timeout="auto" unmountOnExit>
         <Container sx={{ maxHeight: 200, overflow: "auto" }}>
           <List component="div" disablePadding>
             {coordinates?.map((row, index) => (
@@ -45,6 +86,14 @@ const CoordinatesList: FunctionComponent<CoordinatesListProps> = ({
           </List>
         </Container>
       </Collapse>
+      <EntityDialog
+        open={isDialogOpen}
+        setOpen={setIsDialogOpen}
+        label={label}
+        setLabel={setLabel}
+        color={color}
+        setColor={setColor}
+      />
     </Fragment>
   );
 };
diff --git a/components/DynamicModeContainer/DynamicModeContainer.tsx b/components/DynamicModeContainer/DynamicModeContainer.tsx
index e614153..02b9ed2 100644
--- a/components/DynamicModeContainer/DynamicModeContainer.tsx
+++ b/components/DynamicModeContainer/DynamicModeContainer.tsx
@@ -14,6 +14,8 @@ import { db } from "../../config/firebaseClient";
 import { useAppDispatch, useAppSelector } from "../../config/hooks";
 import { selectSession, updateEntities } from "../../features/sessions/slice";
 import { ICoordinatesData } from "../../models/ICoordinatesData";
+import { IEntity } from "../../models/IEntity";
+import { getRandomColor } from "../../utils/colors";
 import MapContainer from "../MapContainer/MapContainer";
 
 interface DynamicModeContainerProps {
@@ -30,7 +32,8 @@ const DynamicModeContainer: FunctionComponent<DynamicModeContainerProps> = ({
     const entitiesIds = [...new Set(coordinatesData?.map(({ id }) => id))];
     return entitiesIds.map((entityId) => ({
       id: entityId,
-      color: "#ff0000",
+      label: entityId,
+      color: getRandomColor(),
       coordinates: coordinatesData.filter(({ id }) => id === entityId),
     }));
   };
diff --git a/components/EntityDialog/EntityDialog.tsx b/components/EntityDialog/EntityDialog.tsx
new file mode 100644
index 0000000..ea87b57
--- /dev/null
+++ b/components/EntityDialog/EntityDialog.tsx
@@ -0,0 +1,97 @@
+import { Box } from "@mui/material";
+import Button from "@mui/material/Button";
+import Dialog from "@mui/material/Dialog";
+import DialogActions from "@mui/material/DialogActions";
+import DialogContent from "@mui/material/DialogContent";
+import DialogTitle from "@mui/material/DialogTitle";
+import TextField from "@mui/material/TextField";
+import { FunctionComponent, useEffect, useState } from "react";
+import ColorPicker from "../ColorPicker/ColorPicker";
+
+interface EntityDialogProps {
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  label: string;
+  setLabel: (label: string) => void;
+  color: string;
+  setColor: (color: string) => void;
+}
+const EntityDialog: FunctionComponent<EntityDialogProps> = ({
+  open,
+  setOpen,
+  label,
+  setLabel,
+  color,
+  setColor,
+}) => {
+  const [currentColor, setCurrentColor] = useState<string>("");
+  const [currentLabel, setCurrentLabel] = useState<string>("");
+
+  useEffect(() => {
+    setCurrentColor(color);
+    setCurrentLabel(label);
+  }, [open]);
+
+  const handleSubmit = () => {
+    setColor(currentColor);
+    setLabel(currentLabel);
+    setOpen(false);
+  };
+
+  return (
+    <div>
+      <Dialog open={open} onClose={() => setOpen(false)}>
+        <DialogTitle>Edit entity</DialogTitle>
+
+        <DialogContent>
+          <Box
+            component="form"
+            onSubmit={handleSubmit}
+            noValidate
+            sx={{ mt: 1 }}
+          >
+            <div
+              style={{
+                display: "flex",
+                flexDirection: "row",
+                alignItems: "center",
+                justifyContent: "space-between",
+              }}
+            >
+              <div style={{ justifyContent: "flex-start", paddingRight: 8 }}>
+                <ColorPicker
+                  selectedColor={currentColor}
+                  onChangeColor={(evt) => setCurrentColor(evt.target.value)}
+                />
+              </div>
+              <TextField
+                id="label"
+                name="label"
+                label="Label"
+                size="small"
+                value={currentLabel}
+                required
+                autoFocus
+                onChange={(evt) => setCurrentLabel(evt.target.value)}
+                sx={{ alignSelf: "center" }}
+              />
+            </div>
+            <Button
+              onClick={handleSubmit}
+              type="button"
+              fullWidth
+              variant="contained"
+            >
+              Save
+            </Button>
+          </Box>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setOpen(false)}>Cancel</Button>
+        </DialogActions>
+      </Dialog>
+    </div>
+  );
+};
+
+export default EntityDialog;
diff --git a/components/FilesSelectionContainer/FilesSelectionContainer.tsx b/components/FilesSelectionContainer/FilesSelectionContainer.tsx
index 4b6ca93..4a9be31 100644
--- a/components/FilesSelectionContainer/FilesSelectionContainer.tsx
+++ b/components/FilesSelectionContainer/FilesSelectionContainer.tsx
@@ -20,7 +20,8 @@ import {
   editEntity,
   selectEntities,
 } from "../../features/sessions/slice";
-import ColorPicker, { Colors } from "../ColorPicker/ColorPicker";
+import { getRandomColor } from "../../utils/colors";
+import ColorPicker from "../ColorPicker/ColorPicker";
 import FileUploadButton from "../FileUploadButton/FileUploadButton";
 import Link from "../Link/Link";
 
@@ -28,14 +29,6 @@ const FilesSelectionContainer: FunctionComponent = () => {
   const dispatch = useAppDispatch();
   const entities = useAppSelector(selectEntities);
 
-  const getRandomColor = (): string => {
-    const colors = Object.keys(Colors);
-    const index = Math.floor(Math.random() * colors.length);
-    const key = colors[index];
-
-    return Colors[key];
-  };
-
   const parseFileData = (file: File) => {
     Papa.parse(file, {
       header: true,
@@ -44,6 +37,7 @@ const FilesSelectionContainer: FunctionComponent = () => {
         dispatch(
           createEntity({
             id: file.name,
+            label: file.name,
             color: getRandomColor(),
             coordinates: data,
           })
@@ -132,10 +126,12 @@ const FilesSelectionContainer: FunctionComponent = () => {
                   onDelete={() => onRemoveFile(id)}
                   deleteIcon={<Delete fontSize="small" />}
                 />
-                <ColorPicker
-                  selectedColor={color}
-                  onChangeColor={(evt) => onChangeColor(id, evt)}
-                />
+                <div style={{ paddingLeft: 8 }}>
+                  <ColorPicker
+                    selectedColor={color}
+                    onChangeColor={(evt) => onChangeColor(id, evt)}
+                  />
+                </div>
               </ListItem>
             ))}
           </List>
diff --git a/models/IEntity.ts b/models/IEntity.ts
index 394eeb3..0b46bad 100644
--- a/models/IEntity.ts
+++ b/models/IEntity.ts
@@ -2,6 +2,7 @@ import { ICoordinatesData } from "./ICoordinatesData";
 
 export interface IEntity {
   id: string;
+  label: string;
   color: string;
   coordinates: ICoordinatesData[];
 }
diff --git a/utils/colors.ts b/utils/colors.ts
new file mode 100644
index 0000000..32dc9c2
--- /dev/null
+++ b/utils/colors.ts
@@ -0,0 +1,23 @@
+export const Colors = {
+  Gray: "#212529",
+  Red: "#c92a2a",
+  Pink: "#a61e4d",
+  Grape: "#862e9c",
+  Violet: "#5f3dc4",
+  Indigo: "#364fc7",
+  Blue: "#1864ab",
+  Cyan: "#0b7285",
+  Teal: "#087f5b",
+  Green: "#2b8a3e",
+  Lime: "#5c940d",
+  Yellow: "#e67700",
+  Orange: "#d9480f",
+};
+
+export const getRandomColor = (): string => {
+  const colors = Object.keys(Colors);
+  const index = Math.floor(Math.random() * colors.length);
+  const key = colors[index];
+
+  return Colors[key];
+};