diff --git a/openlp/plugins/media/forms/mediaclipselectordialog.py b/openlp/plugins/media/forms/mediaclipselectordialog.py
index fe62c99d3..88b4616eb 100644
--- a/openlp/plugins/media/forms/mediaclipselectordialog.py
+++ b/openlp/plugins/media/forms/mediaclipselectordialog.py
@@ -40,17 +40,14 @@ class Ui_MediaClipSelector(object):
         self.combobox_size_policy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
         media_clip_selector.setSizePolicy(
             QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding))
-        self.central_widget = QtGui.QWidget(media_clip_selector)
-        self.central_widget.setSizePolicy(
-            QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding))
-        self.central_widget.setObjectName('central_widget')
-        self.main_layout = QtGui.QVBoxLayout(self.central_widget)
+        self.main_layout = QtGui.QVBoxLayout(media_clip_selector)
+        self.main_layout.setContentsMargins(8, 8, 8, 8)
         self.main_layout.setObjectName('main_layout')
-        self.central_widget.setLayout(self.main_layout)
         # Source groupbox
-        self.source_groupbox = QtGui.QGroupBox(self.central_widget)
+        self.source_groupbox = QtGui.QGroupBox(media_clip_selector)
         self.source_groupbox.setObjectName('source_groupbox')
         self.source_layout = QtGui.QHBoxLayout()
+        self.source_layout.setContentsMargins(8, 8, 8, 8)
         self.source_layout.setObjectName('source_layout')
         self.source_groupbox.setLayout(self.source_layout)
         # Media path label
@@ -65,15 +62,16 @@ class Ui_MediaClipSelector(object):
         self.media_path_combobox.setObjectName('media_path_combobox')
         self.source_layout.addWidget(self.media_path_combobox)
         # Load disc button
-        self.load_disc_button = QtGui.QPushButton(self.central_widget)
+        self.load_disc_button = QtGui.QPushButton(media_clip_selector)
         self.load_disc_button.setEnabled(True)
         self.load_disc_button.setObjectName('load_disc_button')
         self.source_layout.addWidget(self.load_disc_button)
         self.main_layout.addWidget(self.source_groupbox)
         # Track details group box
-        self.track_groupbox = QtGui.QGroupBox(self.central_widget)
+        self.track_groupbox = QtGui.QGroupBox(media_clip_selector)
         self.track_groupbox.setObjectName('track_groupbox')
         self.track_layout = QtGui.QFormLayout()
+        self.track_layout.setContentsMargins(8, 8, 8, 8)
         self.track_layout.setObjectName('track_layout')
         self.label_alignment = self.track_layout.labelAlignment()
         self.track_groupbox.setLayout(self.track_layout)
@@ -101,7 +99,7 @@ class Ui_MediaClipSelector(object):
         self.subtitle_tracks_combobox.setObjectName('subtitle_tracks_combobox')
         self.track_layout.addRow(self.subtitle_track_label, self.subtitle_tracks_combobox)
         # Preview frame
-        self.preview_frame = QtGui.QFrame(self.central_widget)
+        self.preview_frame = QtGui.QFrame(media_clip_selector)
         self.preview_frame.setMinimumSize(QtCore.QSize(320, 240))
         self.preview_frame.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding))
         self.preview_frame.setStyleSheet('background-color:black;')
@@ -111,24 +109,25 @@ class Ui_MediaClipSelector(object):
         # player controls
         self.controls_layout = QtGui.QHBoxLayout()
         self.controls_layout.setObjectName('controls_layout')
-        self.play_button = QtGui.QToolButton(self.central_widget)
+        self.play_button = QtGui.QToolButton(media_clip_selector)
         self.play_button.setIcon(build_icon(':/slides/media_playback_start.png'))
         self.play_button.setObjectName('play_button')
         self.controls_layout.addWidget(self.play_button)
-        self.position_slider = QtGui.QSlider(self.central_widget)
+        self.position_slider = QtGui.QSlider(media_clip_selector)
         self.position_slider.setTracking(False)
         self.position_slider.setOrientation(QtCore.Qt.Horizontal)
         self.position_slider.setObjectName('position_slider')
         self.controls_layout.addWidget(self.position_slider)
-        self.position_timeedit = QtGui.QTimeEdit(self.central_widget)
+        self.position_timeedit = QtGui.QTimeEdit(media_clip_selector)
         self.position_timeedit.setReadOnly(True)
         self.position_timeedit.setObjectName('position_timeedit')
         self.controls_layout.addWidget(self.position_timeedit)
         self.main_layout.addLayout(self.controls_layout)
         # Range
-        self.range_groupbox = QtGui.QGroupBox(self.central_widget)
+        self.range_groupbox = QtGui.QGroupBox(media_clip_selector)
         self.range_groupbox.setObjectName('range_groupbox')
         self.range_layout = QtGui.QGridLayout()
+        self.range_layout.setContentsMargins(8, 8, 8, 8)
         self.range_layout.setObjectName('range_layout')
         self.range_groupbox.setLayout(self.range_layout)
         # Start position
@@ -159,7 +158,7 @@ class Ui_MediaClipSelector(object):
         self.range_layout.addWidget(self.jump_end_button, 1, 3)
         self.main_layout.addWidget(self.range_groupbox)
         # Save and close buttons
-        self.button_box = QtGui.QDialogButtonBox(self.central_widget)
+        self.button_box = QtGui.QDialogButtonBox(media_clip_selector)
         self.button_box.addButton(QtGui.QDialogButtonBox.Save)
         self.button_box.addButton(QtGui.QDialogButtonBox.Cancel)
         self.close_button = self.button_box.button(QtGui.QDialogButtonBox.Cancel)
@@ -206,4 +205,4 @@ class Ui_MediaClipSelector(object):
         self.end_position_label.setText(translate('MediaPlugin.MediaClipSelector', 'End point:'))
         self.end_timeedit.setDisplayFormat(translate('MediaPlugin.MediaClipSelector', 'HH:mm:ss.z'))
         self.set_end_button.setText(translate('MediaPlugin.MediaClipSelector', 'Set end point'))
-        self.jump_end_button.setText(translate('MediaPlugin.MediaClipSelector', 'Jump to end point'))
\ No newline at end of file
+        self.jump_end_button.setText(translate('MediaPlugin.MediaClipSelector', 'Jump to end point'))