diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.form b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.form
index 312a8571beb..91c4b3a6f47 100644
--- a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.form
+++ b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.form
@@ -79,7 +79,7 @@
               <grid row="1" column="0" row-span="1" col-span="10" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Repository "/>
+              <text value="Repository Configuration"/>
             </properties>
           </component>
           <component id="e99f8" class="javax.swing.JCheckBox" binding="enableHydraCheckBox">
@@ -95,7 +95,7 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Hydra Repository"/>
+              <text value="Repository URL"/>
             </properties>
           </component>
           <component id="88842" class="javax.swing.JLabel">
@@ -103,7 +103,7 @@
               <grid row="4" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Hydra Version"/>
+              <text value="Hydra version"/>
             </properties>
           </component>
           <component id="2168e" class="com.intellij.ui.TitledSeparator">
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.java b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.java
index 9131bf9d6a0..b518945c18d 100644
--- a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.java
+++ b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerConfigurationPanel.java
@@ -149,16 +149,16 @@ private void createUIComponents() {
         hydraStoreDirectoryField = new TextFieldWithBrowseButton();
         panel1.add(hydraStoreDirectoryField, new GridConstraints(8, 2, 1, 8, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final TitledSeparator titledSeparator1 = new TitledSeparator();
-        titledSeparator1.setText("Repository ");
+        titledSeparator1.setText("Repository Configuration");
         panel1.add(titledSeparator1, new GridConstraints(1, 0, 1, 10, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         enableHydraCheckBox = new JCheckBox();
         enableHydraCheckBox.setText("Enable Hydra");
         panel1.add(enableHydraCheckBox, new GridConstraints(0, 0, 1, 3, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label4 = new JLabel();
-        label4.setText("Hydra Repository");
+        label4.setText("Repository URL");
         panel1.add(label4, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label5 = new JLabel();
-        label5.setText("Hydra Version");
+        label5.setText("Hydra version");
         panel1.add(label5, new GridConstraints(4, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final TitledSeparator titledSeparator2 = new TitledSeparator();
         titledSeparator2.setText("Options");
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettings.scala b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettings.scala
index a9c0690287c..1c2c6f8940b 100644
--- a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettings.scala
+++ b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettings.scala
@@ -1,6 +1,5 @@
 package org.jetbrains.plugins.hydra.compiler
 
-import java.io.File
 import java.nio.file.Paths
 
 import com.intellij.openapi.components._
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/ScalaHydraCompilerConfigurationPanel.scala b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/ScalaHydraCompilerConfigurationPanel.scala
index 46eb86f79cd..812dee7fee8 100644
--- a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/ScalaHydraCompilerConfigurationPanel.scala
+++ b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/ScalaHydraCompilerConfigurationPanel.scala
@@ -102,7 +102,7 @@ class ScalaHydraCompilerConfigurationPanel(project: Project, settings: HydraComp
   def onDownload(): Unit = {
     Try(new URL(hydraGlobalSettings.getHydraRepositoryUrl)) match {
       case Success(_) => downloadHydraForProjectScalaVersions()
-      case _ => Messages.showErrorDialog(contentPanel, s"""URL "$getHydraRepository" is not valid. To be able to download, please enter a valid URL.""", "URL not valid")
+      case _ => Messages.showErrorDialog(contentPanel, s"$getHydraRepository is not a valid URL.", "Invalid URL")
     }
   }