diff --git a/src/gui/UBTBPageEditWidget.cpp b/src/gui/UBTBPageEditWidget.cpp
index 693c3674..22c017a9 100644
--- a/src/gui/UBTBPageEditWidget.cpp
+++ b/src/gui/UBTBPageEditWidget.cpp
@@ -150,7 +150,7 @@ void UBTBPageEditWidget::onMediaDropped(const QString &url)
     if("" != url){
         QWidget* pMedia = mpMediaContainer->generateMediaWidget(url);
         if(NULL != pMedia){
-            mpDataMgr->medias() << pMedia;
+            mpDataMgr->medias()->append(pMedia);
             mpDataMgr->addMediaUrl(url);
             mpMediaContainer->addWidget(pMedia);
         }
@@ -228,7 +228,7 @@ void UBTBPageEditWidget::clearFields()
     }
     mUrls.clear();
 
-    // TODO: clean the media?
+    mpMediaContainer->cleanMedias();
 
 }
 
diff --git a/src/gui/UBTeacherBarDataMgr.h b/src/gui/UBTeacherBarDataMgr.h
index 96323fa6..2c299474 100644
--- a/src/gui/UBTeacherBarDataMgr.h
+++ b/src/gui/UBTeacherBarDataMgr.h
@@ -54,7 +54,7 @@ public:
     QVector<sAction>* actions(){return &mActionList;}
 
     // Medias
-    QVector<QWidget*> medias(){return mMediaList;}
+    QVector<QWidget*>* medias(){return &mMediaList;}
     void addMediaUrl(const QString& url){mMediaUrls << url;}
     QStringList mediaUrls(){return mMediaUrls;}
 
diff --git a/src/gui/UBTeacherBarWidget.cpp b/src/gui/UBTeacherBarWidget.cpp
index 75c8a978..d0bbc85b 100644
--- a/src/gui/UBTeacherBarWidget.cpp
+++ b/src/gui/UBTeacherBarWidget.cpp
@@ -126,7 +126,7 @@ bool UBTeacherBarWidget::isEmpty()
     return  mData.pageTitle() == "" &&
             mData.urls()->empty() &&
             mData.actions()->empty() &&
-            mData.medias().empty() &&
+            mData.medias()->empty() &&
             mData.comments() == "" &&
             mData.sessionTarget() == "" &&
             mData.sessionTitle() == "";