diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py
index 84ef6c714..ce17e233a 100644
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@@ -40,27 +40,23 @@ class Ui_ThemeWizard(object):
         self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
             QtGui.QPixmap(u':/wizards/wizard_createtheme.bmp'))
         self.welcomePage.setObjectName(u'welcomePage')
-        self.welcomeLayout = QtGui.QHBoxLayout(self.welcomePage)
-        self.welcomeLayout.setMargin(0)
+        self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage)
+        self.welcomeLayout.setMargin(12)
+        self.welcomeLayout.setSpacing(6)
         self.welcomeLayout.setObjectName(u'welcomeLayout')
-        self.welcomePageLayout = QtGui.QVBoxLayout()
-        self.welcomePageLayout.setSpacing(6)
-        self.welcomePageLayout.setMargin(12)
-        self.welcomePageLayout.setObjectName(u'welcomePageLayout')
         self.titleLabel = QtGui.QLabel(self.welcomePage)
         self.titleLabel.setObjectName(u'titleLabel')
-        self.welcomePageLayout.addWidget(self.titleLabel)
+        self.welcomeLayout.addWidget(self.titleLabel)
         self.welcomeTopSpacer = QtGui.QSpacerItem(20, 40,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.welcomePageLayout.addItem(self.welcomeTopSpacer)
+        self.welcomeLayout.addItem(self.welcomeTopSpacer)
         self.informationLabel = QtGui.QLabel(self.welcomePage)
         self.informationLabel.setWordWrap(True)
         self.informationLabel.setObjectName(u'informationLabel')
-        self.welcomePageLayout.addWidget(self.informationLabel)
+        self.welcomeLayout.addWidget(self.informationLabel)
         self.welcomeBottomSpacer = QtGui.QSpacerItem(20, 40,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.welcomePageLayout.addItem(self.welcomeBottomSpacer)
-        self.welcomeLayout.addLayout(self.welcomePageLayout)
+        self.welcomeLayout.addItem(self.welcomeBottomSpacer)
         ThemeWizard.addPage(self.welcomePage)
         self.backgroundPage = QtGui.QWizardPage()
         self.backgroundPage.setObjectName(u'backgroundPage')
diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py
index 0cc62074c..82f549694 100644
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@@ -79,12 +79,8 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         QtGui.QWizard.__init__(self, parent)
         self.setupUi(self)
         self.registerFields()
-        if not BibleFormat.get_availability(BibleFormat.OpenLP1):
-            self.openlp1Page.setVisible(False)
-            self.openlp1LocationLabel.setVisible(False)
-            self.openlp1LocationEdit.setVisible(False)
-            self.openlp1FileButton.setVisible(False)
-            self.openlp1DisabledLabel.setVisible(True)
+        self.hasOpenlp1Import = \
+            BibleFormat.get_availability(BibleFormat.OpenLP1)
         self.finishButton = self.button(QtGui.QWizard.FinishButton)
         self.cancelButton = self.button(QtGui.QWizard.CancelButton)
         self.manager = manager
@@ -92,19 +88,22 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         self.manager.set_process_dialog(self)
         self.web_bible_list = {}
         self.loadWebBibles()
-        QtCore.QObject.connect(self.locationComboBox,
+        QtCore.QObject.connect(self.formatComboBox,
             QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.onLocationComboBoxChanged)
+            self.onFormatComboBoxChanged)
+        QtCore.QObject.connect(self.webSourceComboBox,
+            QtCore.SIGNAL(u'currentIndexChanged(int)'),
+            self.onWebSourceComboBoxChanged)
         QtCore.QObject.connect(self.osisFileButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onOsisFileButtonClicked)
-        QtCore.QObject.connect(self.booksFileButton,
+        QtCore.QObject.connect(self.csvBooksButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onBooksFileButtonClicked)
-        QtCore.QObject.connect(self.csvVersesFileButton,
+        QtCore.QObject.connect(self.csvVersesButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onCsvVersesFileButtonClicked)
-        QtCore.QObject.connect(self.openSongBrowseButton,
+        QtCore.QObject.connect(self.openSongFileButton,
             QtCore.SIGNAL(u'clicked()'),
             self.onOpenSongBrowseButtonClicked)
         QtCore.QObject.connect(self.openlp1FileButton,
@@ -225,7 +224,28 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
             # Progress page
             return True
 
-    def onLocationComboBoxChanged(self, index):
+    def onFormatComboBoxChanged(self, index):
+        """
+        Set Widgets for the selected import format visible.
+
+        ``index``
+            The index of the combo box.
+        """
+        self.osisFileLabel.setVisible(index == 0)
+        self.osisFileWidget.setVisible(index == 0)
+        self.csvBooksLabel.setVisible(index == 1)
+        self.csvBooksWidget.setVisible(index == 1)
+        self.csvVersesLabel.setVisible(index == 1)
+        self.csvVersesWidget.setVisible(index == 1)
+        self.openSongFileLabel.setVisible(index == 2)
+        self.openSongFileWidget.setVisible(index == 2)
+        self.webTabWidget.setVisible(index == 3)
+        self.openlp1FileLabel.setVisible(index == 4 and self.hasOpenlp1Import)
+        self.openlp1FileWidget.setVisible(index == 4 and self.hasOpenlp1Import)
+        self.openlp1DisabledLabel.setVisible(index == 4 and 
+            not self.hasOpenlp1Import)
+
+    def onWebSourceComboBoxChanged(self, index):
         """
         Setup the list of Bibles when you select a different source on the web
         download page.
@@ -233,11 +253,11 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         ``index``
             The index of the combo box.
         """
-        self.bibleComboBox.clear()
+        self.webTranslationComboBox.clear()
         bibles = self.web_bible_list[index].keys()
         bibles.sort()
         for bible in bibles:
-            self.bibleComboBox.addItem(bible)
+            self.webTranslationComboBox.addItem(bible)
 
     def onOsisFileButtonClicked(self):
         """
@@ -245,7 +265,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         """
         self.getFileName(
             translate('BiblesPlugin.ImportWizardForm', 'Open OSIS File'),
-            self.OSISLocationEdit)
+            self.osisFileEdit)
 
     def onBooksFileButtonClicked(self):
         """
@@ -253,7 +273,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         """
         self.getFileName(
             translate('BiblesPlugin.ImportWizardForm', 'Open Books CSV File'),
-            self.booksLocationEdit, u'%s (*.csv)'
+            self.csvBooksEdit, u'%s (*.csv)'
             % translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
 
     def onCsvVersesFileButtonClicked(self):
@@ -261,7 +281,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         Show the file open dialog for the verses CSV file.
         """
         self.getFileName(translate('BiblesPlugin.ImportWizardForm',
-            'Open Verses CSV File'), self.csvVerseLocationEdit, u'%s (*.csv)'
+            'Open Verses CSV File'), self.csvVersesEdit, u'%s (*.csv)'
             % translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
 
     def onOpenSongBrowseButtonClicked(self):
@@ -278,7 +298,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         """
         self.getFileName(
             translate('BiblesPlugin.ImportWizardForm',
-            'Open openlp.org 1.x Bible'), self.openlp1LocationEdit,
+            'Open openlp.org 1.x Bible'), self.openlp1FileEdit,
             u'%s (*.bible)' % translate('BiblesPlugin.ImportWizardForm',
             'openlp.org 1.x bible'))
 
@@ -290,18 +310,17 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
 
     def registerFields(self):
         self.selectPage.registerField(u'source_format', self.formatComboBox)
-        self.selectPage.registerField(u'osis_location', self.OSISLocationEdit)
-        self.selectPage.registerField(u'csv_booksfile', self.booksLocationEdit)
-        self.selectPage.registerField(
-            u'csv_versefile', self.csvVerseLocationEdit)
+        self.selectPage.registerField(u'osis_location', self.osisFileEdit)
+        self.selectPage.registerField(u'csv_booksfile', self.csvBooksEdit)
+        self.selectPage.registerField(u'csv_versefile', self.csvVersesEdit)
         self.selectPage.registerField(u'opensong_file', self.openSongFileEdit)
-        self.selectPage.registerField(u'web_location', self.locationComboBox)
-        self.selectPage.registerField(u'web_biblename', self.bibleComboBox)
-        self.selectPage.registerField(u'proxy_server', self.addressEdit)
-        self.selectPage.registerField(u'proxy_username', self.usernameEdit)
-        self.selectPage.registerField(u'proxy_password', self.passwordEdit)
-        self.selectPage.registerField(
-            u'openlp1_location', self.openlp1LocationEdit)
+        self.selectPage.registerField(u'web_location', self.webSourceComboBox)
+        self.selectPage.registerField(u'web_biblename',
+            self.webTranslationComboBox)
+        self.selectPage.registerField(u'proxy_server', self.webServerEdit)
+        self.selectPage.registerField(u'proxy_username', self.webUserEdit)
+        self.selectPage.registerField(u'proxy_password', self.webPasswordEdit)
+        self.selectPage.registerField(u'openlp1_location', self.openlp1FileEdit)
         self.licenseDetailsPage.registerField(
             u'license_version', self.versionNameEdit)
         self.licenseDetailsPage.registerField(
@@ -322,7 +341,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
         self.setField(u'opensong_file', QtCore.QVariant(''))
         self.setField(u'web_location', QtCore.QVariant(WebDownload.Crosswalk))
         self.setField(u'web_biblename',
-            QtCore.QVariant(self.bibleComboBox.currentIndex()))
+            QtCore.QVariant(self.webTranslationComboBox.currentIndex()))
         self.setField(u'proxy_server',
             settings.value(u'proxy address', QtCore.QVariant(u'')))
         self.setField(u'proxy_username',
@@ -336,7 +355,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
             QtCore.QVariant(self.copyrightEdit.text()))
         self.setField(u'license_permissions',
             QtCore.QVariant(self.permissionsEdit.text()))
-        self.onLocationComboBoxChanged(WebDownload.Crosswalk)
+        self.onWebSourceComboBoxChanged(WebDownload.Crosswalk)
         settings.endGroup()
 
     def loadWebBibles(self):
diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py
index a0b2b99b9..647754674 100644
--- a/openlp/plugins/bibles/forms/bibleimportwizard.py
+++ b/openlp/plugins/bibles/forms/bibleimportwizard.py
@@ -31,7 +31,6 @@ from openlp.core.lib import build_icon, translate
 class Ui_BibleImportWizard(object):
     def setupUi(self, bibleImportWizard):
         bibleImportWizard.setObjectName(u'bibleImportWizard')
-        bibleImportWizard.resize(550, 386)
         bibleImportWizard.setModal(True)
         bibleImportWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
         bibleImportWizard.setOptions(
@@ -44,256 +43,221 @@ class Ui_BibleImportWizard(object):
             QtGui.QPixmap(u':/wizards/wizard_importbible.bmp'))
         self.welcomePage.setObjectName(u'WelcomePage')
         self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage)
-        self.welcomeLayout.setSpacing(8)
-        self.welcomeLayout.setMargin(0)
+        self.welcomeLayout.setMargin(12)
+        self.welcomeLayout.setSpacing(6)
         self.welcomeLayout.setObjectName(u'WelcomeLayout')
         self.titleLabel = QtGui.QLabel(self.welcomePage)
         self.titleLabel.setObjectName(u'TitleLabel')
         self.welcomeLayout.addWidget(self.titleLabel)
-        spacerItem = QtGui.QSpacerItem(20, 40,
+        self.welcomeTopSpacer = QtGui.QSpacerItem(20, 40,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.welcomeLayout.addItem(spacerItem)
+        self.welcomeLayout.addItem(self.welcomeTopSpacer)
         self.informationLabel = QtGui.QLabel(self.welcomePage)
         self.informationLabel.setWordWrap(True)
-        self.informationLabel.setMargin(10)
         self.informationLabel.setObjectName(u'InformationLabel')
         self.welcomeLayout.addWidget(self.informationLabel)
-        spacerItem1 = QtGui.QSpacerItem(20, 40,
+        self.welcomeBottomSpacer = QtGui.QSpacerItem(20, 40,
             QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.welcomeLayout.addItem(spacerItem1)
+        self.welcomeLayout.addItem(self.welcomeBottomSpacer)
         bibleImportWizard.addPage(self.welcomePage)
         # Select page
         self.selectPage = QtGui.QWizardPage()
         self.selectPage.setObjectName(u'SelectPage')
         self.selectPageLayout = QtGui.QVBoxLayout(self.selectPage)
-        self.selectPageLayout.setSpacing(8)
-        self.selectPageLayout.setMargin(20)
-        self.selectPageLayout.setObjectName(u'selectPageLayout')
-        self.formatSelectLayout = QtGui.QHBoxLayout()
-        self.formatSelectLayout.setSpacing(8)
-        self.formatSelectLayout.setObjectName(u'FormatSelectLayout')
+        self.selectPageLayout.setMargin(12)
+        self.selectPageLayout.setObjectName(u'SelectPageLayout')
+        self.selectFormLayout = QtGui.QFormLayout()
+        self.selectFormLayout.setVerticalSpacing(6)
+        self.selectFormLayout.setObjectName(u'SelectFormLayout')
         self.formatLabel = QtGui.QLabel(self.selectPage)
         self.formatLabel.setObjectName(u'FormatLabel')
-        self.formatSelectLayout.addWidget(self.formatLabel)
+        self.selectFormLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+            self.formatLabel)
         self.formatComboBox = QtGui.QComboBox(self.selectPage)
+        self.formatComboBox.addItem(u'')
+        self.formatComboBox.addItem(u'')
+        self.formatComboBox.addItem(u'')
+        self.formatComboBox.addItem(u'')
+        self.formatComboBox.addItem(u'')
         self.formatComboBox.setObjectName(u'FormatComboBox')
-        self.formatComboBox.addItem(u'')
-        self.formatComboBox.addItem(u'')
-        self.formatComboBox.addItem(u'')
-        self.formatComboBox.addItem(u'')
-        self.formatComboBox.addItem(u'')
-        self.formatSelectLayout.addWidget(self.formatComboBox)
-        spacerItem2 = QtGui.QSpacerItem(40, 20,
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.formatSelectLayout.addItem(spacerItem2)
-        self.selectPageLayout.addLayout(self.formatSelectLayout)
-        self.formatWidget = QtGui.QStackedWidget(self.selectPage)
-        self.formatWidget.setObjectName(u'FormatWidget')
-        generalIcon = build_icon(u':/general/general_open.png')
-        self.osisPage = QtGui.QWidget()
-        self.osisPage.setObjectName(u'OsisPage')
-        self.osisLayout = QtGui.QFormLayout(self.osisPage)
-        self.osisLayout.setFieldGrowthPolicy(
-            QtGui.QFormLayout.ExpandingFieldsGrow)
-        self.osisLayout.setMargin(0)
-        self.osisLayout.setSpacing(8)
-        self.osisLayout.setObjectName(u'OsisLayout')
-        self.osisLocationLabel = QtGui.QLabel(self.osisPage)
-        self.osisLocationLabel.setObjectName(u'OsisLocationLabel')
-        self.osisLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
-            self.osisLocationLabel)
-        self.osisLocationLayout = QtGui.QHBoxLayout()
-        self.osisLocationLayout.setSpacing(8)
-        self.osisLocationLayout.setObjectName(u'OsisLocationLayout')
-        self.OSISLocationEdit = QtGui.QLineEdit(self.osisPage)
-        self.OSISLocationEdit.setObjectName(u'OSISLocationEdit')
-        self.osisLocationLayout.addWidget(self.OSISLocationEdit)
-        self.osisFileButton = QtGui.QToolButton(self.osisPage)
-        self.osisFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
-        self.osisFileButton.setIcon(generalIcon)
+        self.selectFormLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+            self.formatComboBox)
+        self.osisFileLabel = QtGui.QLabel(self.selectPage)
+        self.osisFileLabel.setObjectName(u'OsisFileLabel')
+        self.selectFormLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+            self.osisFileLabel)
+        self.osisFileWidget = QtGui.QWidget(self.selectPage)
+        self.osisFileWidget.setObjectName(u'OsisFileWidget')
+        self.osisFileLayout = QtGui.QHBoxLayout(self.osisFileWidget)
+        self.osisFileLayout.setMargin(0)
+        self.osisFileLayout.setObjectName(u'OsisFileLayout')
+        self.osisFileEdit = QtGui.QLineEdit(self.osisFileWidget)
+        self.osisFileEdit.setObjectName(u'OsisFileEdit')
+        self.osisFileLayout.addWidget(self.osisFileEdit)
+        self.osisFileButton = QtGui.QToolButton(self.osisFileWidget)
+        self.osisFileButton.setIcon(build_icon(u':/general/general_open.png'))
         self.osisFileButton.setObjectName(u'OsisFileButton')
-        self.osisLocationLayout.addWidget(self.osisFileButton)
-        self.osisLayout.setLayout(1, QtGui.QFormLayout.FieldRole,
-            self.osisLocationLayout)
-        self.formatWidget.addWidget(self.osisPage)
-        self.csvPage = QtGui.QWidget()
-        self.csvPage.setObjectName(u'CsvPage')
-        self.csvSourceLayout = QtGui.QFormLayout(self.csvPage)
-        self.csvSourceLayout.setFieldGrowthPolicy(
-            QtGui.QFormLayout.ExpandingFieldsGrow)
-        self.csvSourceLayout.setLabelAlignment(QtCore.Qt.AlignBottom |
-            QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing)
-        self.csvSourceLayout.setFormAlignment(QtCore.Qt.AlignLeading |
-            QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
-        self.csvSourceLayout.setMargin(0)
-        self.csvSourceLayout.setSpacing(8)
-        self.csvSourceLayout.setObjectName(u'CsvSourceLayout')
-        self.booksLocationLabel = QtGui.QLabel(self.csvPage)
-        self.booksLocationLabel.setObjectName(u'BooksLocationLabel')
-        self.csvSourceLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
-            self.booksLocationLabel)
-        self.csvBooksLayout = QtGui.QHBoxLayout()
-        self.csvBooksLayout.setSpacing(8)
+        self.osisFileLayout.addWidget(self.osisFileButton)
+        self.selectFormLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+            self.osisFileWidget)
+        self.csvBooksLabel = QtGui.QLabel(self.selectPage)
+        self.csvBooksLabel.setVisible(False)
+        self.csvBooksLabel.setObjectName(u'CsvBooksLabel')
+        self.selectFormLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+            self.csvBooksLabel)
+        self.csvBooksWidget = QtGui.QWidget(self.selectPage)
+        self.csvBooksWidget.setVisible(False)
+        self.csvBooksWidget.setObjectName(u'CsvBooksWidget')
+        self.csvBooksLayout = QtGui.QHBoxLayout(self.csvBooksWidget)
+        self.csvBooksLayout.setMargin(0)
         self.csvBooksLayout.setObjectName(u'CsvBooksLayout')
-        self.booksLocationEdit = QtGui.QLineEdit(self.csvPage)
-        self.booksLocationEdit.setObjectName(u'BooksLocationEdit')
-        self.csvBooksLayout.addWidget(self.booksLocationEdit)
-        self.booksFileButton = QtGui.QToolButton(self.csvPage)
-        self.booksFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
-        self.booksFileButton.setIcon(generalIcon)
-        self.booksFileButton.setObjectName(u'BooksFileButton')
-        self.csvBooksLayout.addWidget(self.booksFileButton)
-        self.csvSourceLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
-            self.csvBooksLayout)
-        self.verseLocationLabel = QtGui.QLabel(self.csvPage)
-        self.verseLocationLabel.setObjectName(u'VerseLocationLabel')
-        self.csvSourceLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
-            self.verseLocationLabel)
-        self.csvVerseLayout = QtGui.QHBoxLayout()
-        self.csvVerseLayout.setSpacing(8)
-        self.csvVerseLayout.setObjectName(u'CsvVerseLayout')
-        self.csvVerseLocationEdit = QtGui.QLineEdit(self.csvPage)
-        self.csvVerseLocationEdit.setObjectName(u'CsvVerseLocationEdit')
-        self.csvVerseLayout.addWidget(self.csvVerseLocationEdit)
-        self.csvVersesFileButton = QtGui.QToolButton(self.csvPage)
-        self.csvVersesFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
-        self.csvVersesFileButton.setIcon(generalIcon)
-        self.csvVersesFileButton.setObjectName(u'CsvVersesFileButton')
-        self.csvVerseLayout.addWidget(self.csvVersesFileButton)
-        self.csvSourceLayout.setLayout(1, QtGui.QFormLayout.FieldRole,
-            self.csvVerseLayout)
-        self.formatWidget.addWidget(self.csvPage)
-        self.openSongPage = QtGui.QWidget()
-        self.openSongPage.setObjectName(u'OpenSongPage')
-        self.openSongLayout = QtGui.QFormLayout(self.openSongPage)
-        self.openSongLayout.setMargin(0)
-        self.openSongLayout.setSpacing(8)
-        self.openSongLayout.setObjectName(u'OpenSongLayout')
-        self.openSongFileLabel = QtGui.QLabel(self.openSongPage)
+        self.csvBooksEdit = QtGui.QLineEdit(self.csvBooksWidget)
+        self.csvBooksEdit.setObjectName(u'CsvBooksEdit')
+        self.csvBooksLayout.addWidget(self.csvBooksEdit)
+        self.csvBooksButton = QtGui.QToolButton(self.csvBooksWidget)
+        self.csvBooksButton.setIcon(build_icon(u':/general/general_open.png'))
+        self.csvBooksButton.setObjectName(u'CsvBooksButton')
+        self.csvBooksLayout.addWidget(self.csvBooksButton)
+        self.selectFormLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+            self.csvBooksWidget)
+        self.csvVersesLabel = QtGui.QLabel(self.selectPage)
+        self.csvVersesLabel.setVisible(False)
+        self.csvVersesLabel.setObjectName(u'CsvVersesLabel')
+        self.selectFormLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
+            self.csvVersesLabel)
+        self.csvVersesWidget = QtGui.QWidget(self.selectPage)
+        self.csvVersesWidget.setVisible(False)
+        self.csvVersesWidget.setObjectName(u'CsvVersesWidget')
+        self.csvVersesLayout = QtGui.QHBoxLayout(self.csvVersesWidget)
+        self.csvVersesLayout.setMargin(0)
+        self.csvVersesLayout.setObjectName(u'CsvVersesLayout')
+        self.csvVersesEdit = QtGui.QLineEdit(self.csvVersesWidget)
+        self.csvVersesEdit.setObjectName(u'CsvVersesEdit')
+        self.csvVersesLayout.addWidget(self.csvVersesEdit)
+        self.csvVersesButton = QtGui.QToolButton(self.csvVersesWidget)
+        self.csvVersesButton.setIcon(build_icon(u':/general/general_open.png'))
+        self.csvVersesButton.setObjectName(u'CsvVersesButton')
+        self.csvVersesLayout.addWidget(self.csvVersesButton)
+        self.selectFormLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
+            self.csvVersesWidget)
+        self.openSongFileLabel = QtGui.QLabel(self.selectPage)
+        self.openSongFileLabel.setVisible(False)
         self.openSongFileLabel.setObjectName(u'OpenSongFileLabel')
-        self.openSongLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+        self.selectFormLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
             self.openSongFileLabel)
-        self.openSongFileLayout = QtGui.QHBoxLayout()
-        self.openSongFileLayout.setSpacing(8)
+        self.openSongFileWidget = QtGui.QWidget(self.selectPage)
+        self.openSongFileWidget.setVisible(False)
+        self.openSongFileWidget.setObjectName(u'OpenSongFileWidget')
+        self.openSongFileLayout = QtGui.QHBoxLayout(self.openSongFileWidget)
+        self.openSongFileLayout.setMargin(0)
         self.openSongFileLayout.setObjectName(u'OpenSongFileLayout')
-        self.openSongFileEdit = QtGui.QLineEdit(self.openSongPage)
+        self.openSongFileEdit = QtGui.QLineEdit(self.openSongFileWidget)
         self.openSongFileEdit.setObjectName(u'OpenSongFileEdit')
         self.openSongFileLayout.addWidget(self.openSongFileEdit)
-        self.openSongBrowseButton = QtGui.QToolButton(self.openSongPage)
-        self.openSongBrowseButton.setIcon(generalIcon)
-        self.openSongBrowseButton.setObjectName(u'OpenSongBrowseButton')
-        self.openSongFileLayout.addWidget(self.openSongBrowseButton)
-        self.openSongLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
-            self.openSongFileLayout)
-        self.formatWidget.addWidget(self.openSongPage)
-        self.webDownloadPage = QtGui.QWidget()
-        self.webDownloadPage.setObjectName(u'WebDownloadPage')
-        self.webDownloadLayout = QtGui.QVBoxLayout(self.webDownloadPage)
-        self.webDownloadLayout.setSpacing(8)
-        self.webDownloadLayout.setMargin(0)
-        self.webDownloadLayout.setObjectName(u'WebDownloadLayout')
-        self.webDownloadTabWidget = QtGui.QTabWidget(self.webDownloadPage)
-        self.webDownloadTabWidget.setObjectName(u'WebDownloadTabWidget')
-        self.downloadOptionsTab = QtGui.QWidget()
-        self.downloadOptionsTab.setObjectName(u'DownloadOptionsTab')
-        self.downloadOptionsLayout = QtGui.QFormLayout(self.downloadOptionsTab)
-        self.downloadOptionsLayout.setMargin(8)
-        self.downloadOptionsLayout.setSpacing(8)
-        self.downloadOptionsLayout.setObjectName(u'DownloadOptionsLayout')
-        self.locationLabel = QtGui.QLabel(self.downloadOptionsTab)
-        self.locationLabel.setObjectName(u'LocationLabel')
-        self.downloadOptionsLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
-            self.locationLabel)
-        self.locationComboBox = QtGui.QComboBox(self.downloadOptionsTab)
-        self.locationComboBox.setObjectName(u'LocationComboBox')
-        self.locationComboBox.addItem(u'')
-        self.locationComboBox.addItem(u'')
-        self.locationComboBox.addItem(u'')
-        self.downloadOptionsLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
-            self.locationComboBox)
-        self.bibleLabel = QtGui.QLabel(self.downloadOptionsTab)
-        self.bibleLabel.setObjectName(u'BibleLabel')
-        self.downloadOptionsLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
-            self.bibleLabel)
-        self.bibleComboBox = QtGui.QComboBox(self.downloadOptionsTab)
-        self.bibleComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
-        self.bibleComboBox.setObjectName(u'BibleComboBox')
-        self.bibleComboBox.addItem(u'')
-        self.bibleComboBox.addItem(u'')
-        self.bibleComboBox.addItem(u'')
-        self.downloadOptionsLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
-            self.bibleComboBox)
-        self.webDownloadTabWidget.addTab(self.downloadOptionsTab, u'')
-        self.proxyServerTab = QtGui.QWidget()
-        self.proxyServerTab.setObjectName(u'ProxyServerTab')
-        self.proxyServerLayout = QtGui.QFormLayout(self.proxyServerTab)
-        self.proxyServerLayout.setObjectName(u'ProxyServerLayout')
-        self.addressLabel = QtGui.QLabel(self.proxyServerTab)
-        self.addressLabel.setObjectName(u'AddressLabel')
-        self.proxyServerLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
-            self.addressLabel)
-        self.addressEdit = QtGui.QLineEdit(self.proxyServerTab)
-        self.addressEdit.setObjectName(u'AddressEdit')
-        self.proxyServerLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
-            self.addressEdit)
-        self.usernameLabel = QtGui.QLabel(self.proxyServerTab)
-        self.usernameLabel.setObjectName(u'UsernameLabel')
-        self.proxyServerLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
-            self.usernameLabel)
-        self.usernameEdit = QtGui.QLineEdit(self.proxyServerTab)
-        self.usernameEdit.setObjectName(u'UsernameEdit')
-        self.proxyServerLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
-            self.usernameEdit)
-        self.passwordLabel = QtGui.QLabel(self.proxyServerTab)
-        self.passwordLabel.setObjectName(u'PasswordLabel')
-        self.proxyServerLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
-            self.passwordLabel)
-        self.passwordEdit = QtGui.QLineEdit(self.proxyServerTab)
-        self.passwordEdit.setObjectName(u'PasswordEdit')
-        self.proxyServerLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
-            self.passwordEdit)
-        self.webDownloadTabWidget.addTab(self.proxyServerTab, u'')
-        self.webDownloadLayout.addWidget(self.webDownloadTabWidget)
-        self.formatWidget.addWidget(self.webDownloadPage)
-        self.openlp1Page = QtGui.QWidget()
-        self.openlp1Page.setObjectName(u'Openlp1Page')
-        self.openlp1Layout = QtGui.QFormLayout(self.openlp1Page)
-        self.openlp1Layout.setFieldGrowthPolicy(
-            QtGui.QFormLayout.ExpandingFieldsGrow)
-        self.openlp1Layout.setMargin(0)
-        self.openlp1Layout.setSpacing(8)
-        self.openlp1Layout.setObjectName(u'Openlp1Layout')
-        self.openlp1LocationLabel = QtGui.QLabel(self.openlp1Page)
-        self.openlp1LocationLabel.setObjectName(u'Openlp1LocationLabel')
-        self.openlp1Layout.setWidget(1, QtGui.QFormLayout.LabelRole,
-            self.openlp1LocationLabel)
-        self.openlp1LocationLayout = QtGui.QHBoxLayout()
-        self.openlp1LocationLayout.setSpacing(8)
-        self.openlp1LocationLayout.setObjectName(u'Openlp1LocationLayout')
-        self.openlp1LocationEdit = QtGui.QLineEdit(self.openlp1Page)
-        self.openlp1LocationEdit.setObjectName(u'Openlp1LocationEdit')
-        self.openlp1LocationLayout.addWidget(self.openlp1LocationEdit)
-        self.openlp1FileButton = QtGui.QToolButton(self.openlp1Page)
-        self.openlp1FileButton.setMaximumSize(QtCore.QSize(32, 16777215))
-        self.openlp1FileButton.setIcon(generalIcon)
+        self.openSongFileButton = QtGui.QToolButton(self.openSongFileWidget)
+        self.openSongFileButton.setIcon(
+            build_icon(u':/general/general_open.png'))
+        self.openSongFileButton.setObjectName(u'OpenSongFileButton')
+        self.openSongFileLayout.addWidget(self.openSongFileButton)
+        self.selectFormLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
+            self.openSongFileWidget)
+        self.openlp1FileLabel = QtGui.QLabel(self.selectPage)
+        self.openlp1FileLabel.setVisible(False)
+        self.openlp1FileLabel.setObjectName(u'Openlp1FileLabel')
+        self.selectFormLayout.setWidget(5, QtGui.QFormLayout.LabelRole,
+            self.openlp1FileLabel)
+        self.openlp1FileWidget = QtGui.QWidget(self.selectPage)
+        self.openlp1FileWidget.setVisible(False)
+        self.openlp1FileWidget.setObjectName(u'Openlp1FileWidget')
+        self.openlp1FileLayout = QtGui.QHBoxLayout(self.openlp1FileWidget)
+        self.openlp1FileLayout.setMargin(0)
+        self.openlp1FileLayout.setObjectName(u'Openlp1FileLayout')
+        self.openlp1FileEdit = QtGui.QLineEdit(self.openlp1FileWidget)
+        self.openlp1FileEdit.setObjectName(u'Openlp1FileEdit')
+        self.openlp1FileLayout.addWidget(self.openlp1FileEdit)
+        self.openlp1FileButton = QtGui.QToolButton(self.openlp1FileWidget)
+        self.openlp1FileButton.setIcon(
+            build_icon(u':/general/general_open.png'))
         self.openlp1FileButton.setObjectName(u'Openlp1FileButton')
-        self.openlp1LocationLayout.addWidget(self.openlp1FileButton)
-        self.openlp1Layout.setLayout(1, QtGui.QFormLayout.FieldRole,
-            self.openlp1LocationLayout)
-        self.openlp1DisabledLabel = QtGui.QLabel(self.openlp1Page)
-        self.openlp1DisabledLabel.setObjectName(u'openlp1DisabledLabel')
+        self.openlp1FileLayout.addWidget(self.openlp1FileButton)
+        self.selectFormLayout.setWidget(5, QtGui.QFormLayout.FieldRole,
+            self.openlp1FileWidget)
+        self.selectPageLayout.addItem(self.selectFormLayout)
+        self.openlp1DisabledLabel = QtGui.QLabel(self.selectPage)
         self.openlp1DisabledLabel.setVisible(False)
-        self.openlp1DisabledLabel.setWordWrap(True)
-        self.openlp1Layout.addWidget(self.openlp1DisabledLabel)
-        self.formatWidget.addWidget(self.openlp1Page)
-        self.selectPageLayout.addWidget(self.formatWidget)
+        self.openlp1DisabledLabel.setObjectName(u'Openlp1DisabledLabel')
+        self.selectPageLayout.addWidget(self.openlp1DisabledLabel)
+        self.webTabWidget = QtGui.QTabWidget(self.selectPage)
+        self.webTabWidget.setSizePolicy(QtGui.QSizePolicy.MinimumExpanding,
+            QtGui.QSizePolicy.MinimumExpanding)
+        self.webTabWidget.setVisible(False)
+        self.webTabWidget.setObjectName(u'WebTabWidget')
+        self.webBibleTab = QtGui.QWidget()
+        self.webBibleTab.setObjectName(u'WebBibleTab')
+        self.webBibleLayout = QtGui.QFormLayout(self.webBibleTab)
+        self.webBibleLayout.setVerticalSpacing(6)
+        self.webBibleLayout.setObjectName(u'WebBibleLayout')
+        self.webSourceLabel = QtGui.QLabel(self.webBibleTab)
+        self.webSourceLabel.setObjectName(u'WebSourceLabel')
+        self.webBibleLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+            self.webSourceLabel)
+        self.webSourceComboBox = QtGui.QComboBox(self.webBibleTab)
+        self.webSourceComboBox.setObjectName(u'WebSourceComboBox')
+        self.webSourceComboBox.addItem(u'')
+        self.webSourceComboBox.addItem(u'')
+        self.webSourceComboBox.addItem(u'')
+        self.webBibleLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+            self.webSourceComboBox)
+        self.webTranslationLabel = QtGui.QLabel(self.webBibleTab)
+        self.webTranslationLabel.setObjectName(u'webTranslationLabel')
+        self.webBibleLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+            self.webTranslationLabel)
+        self.webTranslationComboBox = QtGui.QComboBox(self.webBibleTab)
+        self.webTranslationComboBox.setObjectName(u'WebTranslationComboBox')
+        self.webTranslationComboBox.addItem(u'')
+        self.webTranslationComboBox.addItem(u'')
+        self.webTranslationComboBox.addItem(u'')
+        self.webBibleLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+            self.webTranslationComboBox)
+        self.webTabWidget.addTab(self.webBibleTab, u'')
+        self.webProxyTab = QtGui.QWidget()
+        self.webProxyTab.setObjectName(u'WebProxyTab')
+        self.webProxyLayout = QtGui.QFormLayout(self.webProxyTab)
+        self.webProxyLayout.setVerticalSpacing(6)
+        self.webProxyLayout.setObjectName(u'WebProxyLayout')
+        self.webServerLabel = QtGui.QLabel(self.webProxyTab)
+        self.webServerLabel.setObjectName(u'WebServerLabel')
+        self.webProxyLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+            self.webServerLabel)
+        self.webServerEdit = QtGui.QLineEdit(self.webProxyTab)
+        self.webServerEdit.setObjectName(u'WebServerEdit')
+        self.webProxyLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+            self.webServerEdit)
+        self.webUserLabel = QtGui.QLabel(self.webProxyTab)
+        self.webUserLabel.setObjectName(u'WebUserLabel')
+        self.webProxyLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+            self.webUserLabel)
+        self.webUserEdit = QtGui.QLineEdit(self.webProxyTab)
+        self.webUserEdit.setObjectName(u'WebUserEdit')
+        self.webProxyLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+            self.webUserEdit)
+        self.webPasswordLabel = QtGui.QLabel(self.webProxyTab)
+        self.webPasswordLabel.setObjectName(u'WebPasswordLabel')
+        self.webProxyLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+            self.webPasswordLabel)
+        self.webPasswordEdit = QtGui.QLineEdit(self.webProxyTab)
+        self.webPasswordEdit.setObjectName(u'WebPasswordEdit')
+        self.webProxyLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+            self.webPasswordEdit)
+        self.webTabWidget.addTab(self.webProxyTab, u'')
+        self.selectPageLayout.addWidget(self.webTabWidget)
         bibleImportWizard.addPage(self.selectPage)
         # License page
         self.licenseDetailsPage = QtGui.QWizardPage()
         self.licenseDetailsPage.setObjectName(u'LicenseDetailsPage')
         self.licenseDetailsLayout = QtGui.QFormLayout(self.licenseDetailsPage)
-        self.licenseDetailsLayout.setMargin(20)
-        self.licenseDetailsLayout.setSpacing(8)
+        self.licenseDetailsLayout.setMargin(12)
+        self.licenseDetailsLayout.setVerticalSpacing(6)
         self.licenseDetailsLayout.setObjectName(u'LicenseDetailsLayout')
         self.versionNameLabel = QtGui.QLabel(self.licenseDetailsPage)
         self.versionNameLabel.setObjectName(u'VersionNameLabel')
@@ -324,25 +288,18 @@ class Ui_BibleImportWizard(object):
         self.importPage = QtGui.QWizardPage()
         self.importPage.setObjectName(u'ImportPage')
         self.importLayout = QtGui.QVBoxLayout(self.importPage)
-        self.importLayout.setSpacing(8)
-        self.importLayout.setMargin(50)
+        self.importLayout.setSpacing(6)
+        self.importLayout.setMargin(48)
         self.importLayout.setObjectName(u'ImportLayout')
         self.importProgressLabel = QtGui.QLabel(self.importPage)
         self.importProgressLabel.setObjectName(u'ImportProgressLabel')
         self.importLayout.addWidget(self.importProgressLabel)
         self.importProgressBar = QtGui.QProgressBar(self.importPage)
-        self.importProgressBar.setValue(0)
         self.importProgressBar.setObjectName(u'ImportProgressBar')
         self.importLayout.addWidget(self.importProgressBar)
         bibleImportWizard.addPage(self.importPage)
-
         self.retranslateUi(bibleImportWizard)
-        self.formatWidget.setCurrentIndex(0)
-        self.webDownloadTabWidget.setCurrentIndex(0)
-        QtCore.QObject.connect(self.formatComboBox,
-            QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.formatWidget.setCurrentIndex)
-        QtCore.QMetaObject.connectSlotsByName(bibleImportWizard)
+        self.webTabWidget.setCurrentIndex(0)
 
     def retranslateUi(self, bibleImportWizard):
         bibleImportWizard.setWindowTitle(
@@ -373,37 +330,37 @@ class Ui_BibleImportWizard(object):
             translate('BiblesPlugin.ImportWizardForm', 'Web Download'))
         self.formatComboBox.setItemText(4,
             translate('BiblesPlugin.ImportWizardForm', 'openlp.org 1.x'))
-        self.openlp1LocationLabel.setText(
+        self.openlp1FileLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'File location:'))
-        self.osisLocationLabel.setText(
+        self.osisFileLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'File location:'))
-        self.booksLocationLabel.setText(
+        self.csvBooksLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Books location:'))
-        self.verseLocationLabel.setText(
+        self.csvVersesLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Verse location:'))
         self.openSongFileLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Bible filename:'))
-        self.locationLabel.setText(
+        self.webSourceLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Location:'))
-        self.locationComboBox.setItemText(0,
+        self.webSourceComboBox.setItemText(0,
             translate('BiblesPlugin.ImportWizardForm', 'Crosswalk'))
-        self.locationComboBox.setItemText(1,
+        self.webSourceComboBox.setItemText(1,
             translate('BiblesPlugin.ImportWizardForm', 'BibleGateway'))
-        self.locationComboBox.setItemText(2,
+        self.webSourceComboBox.setItemText(2,
             translate('BiblesPlugin.ImportWizardForm', 'Bibleserver'))
-        self.bibleLabel.setText(
+        self.webTranslationLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Bible:'))
-        self.webDownloadTabWidget.setTabText(
-            self.webDownloadTabWidget.indexOf(self.downloadOptionsTab),
+        self.webTabWidget.setTabText(
+            self.webTabWidget.indexOf(self.webBibleTab),
             translate('BiblesPlugin.ImportWizardForm', 'Download Options'))
-        self.addressLabel.setText(
+        self.webServerLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Server:'))
-        self.usernameLabel.setText(
+        self.webUserLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Username:'))
-        self.passwordLabel.setText(
+        self.webPasswordLabel.setText(
             translate('BiblesPlugin.ImportWizardForm', 'Password:'))
-        self.webDownloadTabWidget.setTabText(
-            self.webDownloadTabWidget.indexOf(self.proxyServerTab),
+        self.webTabWidget.setTabText(
+            self.webTabWidget.indexOf(self.webProxyTab),
             translate('BiblesPlugin.ImportWizardForm',
             'Proxy Server (Optional)'))
         self.licenseDetailsPage.setTitle(