diff --git a/.gitignore b/.gitignore
index 88283ec..f76d1a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /target/
+xmage_launcher.log
 nbactions.xml
 nbactions-*.xml
 nb-configuration.xml
diff --git a/pom.xml b/pom.xml
index 23bc211..f3d0eb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 
     <properties>
         <finalproject.name>XMageLauncher-${project.version}</finalproject.name>
-        <version>0.3.8</version>
+        <version>0.3.9</version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
diff --git a/src/main/java/com/xmage/launcher/XMageLauncher.java b/src/main/java/com/xmage/launcher/XMageLauncher.java
index 1cec549..1d5c5ee 100644
--- a/src/main/java/com/xmage/launcher/XMageLauncher.java
+++ b/src/main/java/com/xmage/launcher/XMageLauncher.java
@@ -115,8 +115,12 @@ private XMageLauncher() {
         frame.setIconImage(icon.getImage());
 
         Random r = new Random();
-        int imageNum = 1 + r.nextInt(17);
-        ImageIcon background = new ImageIcon(new ImageIcon(XMageLauncher.class.getResource("/backgrounds/" + Integer.toString(imageNum) + ".jpg")).getImage().getScaledInstance(width, height, Image.SCALE_SMOOTH));
+        URL imageURL = null;
+        while (imageURL == null) {
+            int imageNum = 1 + r.nextInt(17);
+            imageURL = XMageLauncher.class.getResource("/backgrounds/" + imageNum + ".jpg");
+        }
+        ImageIcon background = new ImageIcon(new ImageIcon(imageURL).getImage().getScaledInstance(width, height, Image.SCALE_SMOOTH));
         mainPanel = new JLabel(background) {
             @Override
             public Dimension getPreferredSize() {
@@ -248,7 +252,6 @@ public void actionPerformed(ActionEvent e) {
             }
         });
 
-        constraints.fill = GridBagConstraints.HORIZONTAL;
         pnlButtons.add(btnLaunchClientServer, constraints);
 
         btnLaunchServer = new JButton(messages.getString("launchServer"));
@@ -347,6 +350,7 @@ private void createToolbar() {
         Border emptyBorder = BorderFactory.createEmptyBorder();
 
         JButton toolbarButton = new JButton("Settings");
+        toolbarButton.setFocusPainted(false);
         toolbarButton.setBorder(emptyBorder);
         toolbarButton.addActionListener(new ActionListener() {
             @Override
@@ -359,6 +363,7 @@ public void actionPerformed(ActionEvent e) {
         toolBar.addSeparator();
 
         toolbarButton = new JButton("About");
+        toolbarButton.setFocusPainted(false);
         toolbarButton.setBorder(emptyBorder);
         toolbarButton.addActionListener(new ActionListener() {
             @Override
@@ -371,6 +376,7 @@ public void actionPerformed(ActionEvent e) {
         toolBar.addSeparator();
 
         toolbarButton = new JButton("Forum");
+        toolbarButton.setFocusPainted(false);
         toolbarButton.setBorder(emptyBorder);
         toolbarButton.addActionListener(new ActionListener() {
             @Override
@@ -382,6 +388,7 @@ public void actionPerformed(ActionEvent e) {
         toolBar.addSeparator();
 
         toolbarButton = new JButton("Website");
+        toolbarButton.setFocusPainted(false);
         toolbarButton.setBorder(emptyBorder);
         toolbarButton.addActionListener(new ActionListener() {
             @Override
@@ -476,16 +483,14 @@ private void localize() {
 
     public static void main(String[] args) {
         try {
-            UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            }catch(ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex){
+                UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+            }
             XMageLauncher gui = new XMageLauncher();
             SwingUtilities.invokeLater(gui);
-        } catch (ClassNotFoundException ex) {
-            logger.error("Error: ", ex);
-        } catch (InstantiationException ex) {
-            logger.error("Error: ", ex);
-        } catch (IllegalAccessException ex) {
-            logger.error("Error: ", ex);
-        } catch (UnsupportedLookAndFeelException ex) {
+        } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
             logger.error("Error: ", ex);
         }
     }