1 files changed, 9 insertions, 2 deletions
diff --git a/app/client/modules/pix2pix/views/pix2pix.show.js b/app/client/modules/pix2pix/views/pix2pix.show.js
index 2713559..4e6e1c3 100644
--- a/app/client/modules/pix2pix/views/pix2pix.show.js
+++ b/app/client/modules/pix2pix/views/pix2pix.show.js
@@ -6,11 +6,10 @@ import util from '../../../util'
 import * as pix2pixActions from '../pix2pix.actions'
 import * as pix2pixTasks from '../pix2pix.tasks'
 
-import Loading from '../../../common/loading.component'
+import { Loading, CurrentTask, FileList, FileRow } from '../../../common'
 import DatasetForm from '../../../dataset/dataset.form'
 import NewDatasetForm from '../../../dataset/dataset.new'
 import UploadStatus from '../../../dataset/upload.status'
-import { FileList, FileRow } from '../../../common/fileList.component'
 
 import DatasetComponent from '../../../dataset/dataset.component'
 
@@ -48,6 +47,7 @@ class Pix2pixShow extends Component {
             <UploadStatus />
           </div>
         </div>
+        <div className='row'>
         {folder && folder.name && folder.name !== 'unsorted' &&
           <DatasetForm
             title='Add Files'
@@ -56,6 +56,13 @@ class Pix2pixShow extends Component {
             canUpload canAddURL
           />
         }
+          <div>
+            <UploadStatus />
+            <CurrentTask />
+          </div>
+        </div>
+
+
         <DatasetComponent
           loading={pix2pix.loading}
           progress={pix2pix.progress}