diff --git a/src/components/flightPlans/FlightPlanMap.vue b/src/components/flightPlans/FlightPlanMap.vue
index e6187b0..735629b 100644
--- a/src/components/flightPlans/FlightPlanMap.vue
+++ b/src/components/flightPlans/FlightPlanMap.vue
@@ -85,6 +85,9 @@ const handleMarkerMove = async (idx, event) => {
     :airports="airports"
     v-bind="$attrs"
     :fullscreen-control="false"
+    :show-info-window="true"
+    :show-layer-controls="true"
+    :allow-add-marker="true"
     @add-to-route="addMarker"
 
   >
diff --git a/src/components/map/AirspaceInfoWindow.vue b/src/components/map/AirspaceInfoWindow.vue
index aa7012d..8b7e504 100644
--- a/src/components/map/AirspaceInfoWindow.vue
+++ b/src/components/map/AirspaceInfoWindow.vue
@@ -76,8 +76,7 @@ const highlightAirspace = (airspace) => {
     </div>
 
     <div v-if="infoWindow.poi">
-      <q-img :src="infoWindow.poi.titlePhoto.thumbnailUrl" v-if="infoWindow.poi.titlePhoto"/>
-      {{ infoWindow.poi.name }}
+      <q-img :src="infoWindow.poi.titlePhoto.thumbnailUrl" width="300px" v-if="infoWindow.poi.titlePhoto"/>
     </div>
 
     <template v-if="infoWindow.airspaces?.length">
diff --git a/src/components/map/MapWrapper.vue b/src/components/map/MapWrapper.vue
index a7979c0..35efad0 100644
--- a/src/components/map/MapWrapper.vue
+++ b/src/components/map/MapWrapper.vue
@@ -188,6 +188,7 @@ const handleAirportClick = (airport) => {
     <AirspaceInfoWindow
       v-if="showInfoWindow && infoWindow.active"
       :info-window="infoWindow"
+      :show-actions="allowAddMarker"
       :highlighted-airspaces="highlightedAirspaces"
       @close="infoWindow.active=false"
       @add-to-route="emits('add-to-route', $event)"
diff --git a/src/pages/profile/flight/FlightDetailPage.vue b/src/pages/profile/flight/FlightDetailPage.vue
index 5baedcf..d4c8e43 100644
--- a/src/pages/profile/flight/FlightDetailPage.vue
+++ b/src/pages/profile/flight/FlightDetailPage.vue
@@ -30,6 +30,7 @@ import CopyLinkButton from "components/inputs/CopyLinkButton.vue";
 import {TOGGLE_FLIGHT_PUBLISH} from "src/graphql/mutations/flight";
 import {useAirspacesStore} from "stores/Airspaces";
 import {useAirportsStore} from "stores/Airports";
+import MapWrapper from "components/map/MapWrapper.vue";
 
 const flightId = parseInt(useRoute().params.id);
 const loggedUser = storeToRefs(useLoggedUserStore()).user;
@@ -152,6 +153,8 @@ const togglePublicVisibility = (variables) => toggleVisibility({
           <FlightTrackMap
             :airspaces-data="airspaces"
             :airports="airports"
+            :show-info-window="true"
+            :show-layer-controls="true"
             :flight="flight"
             :photos="flight.photos"
           />
diff --git a/src/pages/profile/flightPlanner/FlightPlansPage.vue b/src/pages/profile/flightPlanner/FlightPlansPage.vue
index 58daa90..09bd853 100644
--- a/src/pages/profile/flightPlanner/FlightPlansPage.vue
+++ b/src/pages/profile/flightPlanner/FlightPlansPage.vue
@@ -24,11 +24,11 @@ const {flightPlans, isQueryRunning} = storeToRefs(useFlightPlansStore());
 </script>
 
 <template>
-  <BasicListSkeleton v-if="isQueryRunning || !flightPlans"/>
+  <BasicListSkeleton :items=5 v-if="isQueryRunning || !flightPlans"/>
 
   <BasicInfoBanner
     v-else-if="!isQueryRunning && flightPlans.length === 0"
-    :route-add='{name: "addOrganization"}'
+    :route-add='{name: "newFlightPlan"}'
   >
     Aktuálně nemáš žádné naplánované lety.
   </BasicInfoBanner>
diff --git a/src/pages/profile/flightPlanner/NewFlightPlanPage.vue b/src/pages/profile/flightPlanner/NewFlightPlanPage.vue
index 371a865..e2e5843 100644
--- a/src/pages/profile/flightPlanner/NewFlightPlanPage.vue
+++ b/src/pages/profile/flightPlanner/NewFlightPlanPage.vue
@@ -8,7 +8,10 @@ const $router = useRouter();
 onMounted(async () => {
   await useFlightPlansStore().create({
     name: "",
+    isDefaultName: true,
     isPublic: false,
+    isEditableByCopilot: false,
+    plannedSpeed: 150,
     markers: []
   }).then(fp => {
     return $router.replace({name: "editFlightPlan", params: {id: fp.id}});