diff --git a/src/calibre/gui2/main.ui b/src/calibre/gui2/main.ui
index de794d6143..c53f89b3ec 100644
--- a/src/calibre/gui2/main.ui
+++ b/src/calibre/gui2/main.ui
@@ -27,9 +27,9 @@
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>74</y>
+     <y>86</y>
      <width>865</width>
-     <height>723</height>
+     <height>712</height>
     </rect>
    </property>
    <layout class="QGridLayout" >
@@ -332,8 +332,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>857</width>
-         <height>571</height>
+         <width>847</width>
+         <height>553</height>
         </rect>
        </property>
        <layout class="QGridLayout" >
@@ -380,7 +380,7 @@
      <x>0</x>
      <y>0</y>
      <width>865</width>
-     <height>74</height>
+     <height>86</height>
     </rect>
    </property>
    <property name="minimumSize" >
@@ -425,9 +425,9 @@
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>797</y>
+     <y>798</y>
      <width>865</width>
-     <height>25</height>
+     <height>24</height>
     </rect>
    </property>
    <property name="mouseTracking" >
@@ -499,6 +499,9 @@
    <property name="text" >
     <string>Save to disk</string>
    </property>
+   <property name="shortcut" >
+    <string>S</string>
+   </property>
   </action>
   <action name="action_news" >
    <property name="icon" >
@@ -508,6 +511,9 @@
    <property name="text" >
     <string>Fetch news</string>
    </property>
+   <property name="shortcut" >
+    <string>F</string>
+   </property>
   </action>
   <action name="action_convert" >
    <property name="icon" >
@@ -517,6 +523,9 @@
    <property name="text" >
     <string>Convert E-books</string>
    </property>
+   <property name="shortcut" >
+    <string>C</string>
+   </property>
   </action>
   <action name="action_view" >
    <property name="icon" >
@@ -526,6 +535,9 @@
    <property name="text" >
     <string>View</string>
    </property>
+   <property name="shortcut" >
+    <string>V</string>
+   </property>
   </action>
  </widget>
  <customwidgets>
diff --git a/src/calibre/translations/__init__.py b/src/calibre/translations/__init__.py
index 841add1841..46a73639e3 100644
--- a/src/calibre/translations/__init__.py
+++ b/src/calibre/translations/__init__.py
@@ -3,16 +3,16 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 '''
 Manage translation of user visible strings.
 '''
-
 import sys, os, cStringIO, tempfile, subprocess, functools, tarfile, re, time, \
-       glob, urllib2, shutil 
+       glob, urllib2, shutil
 check_call = functools.partial(subprocess.check_call, shell=True)
 
 try:
     from calibre.translations.pygettext import main as pygettext
     from calibre.translations.msgfmt import main as msgfmt
 except ImportError:
-    sys.path.insert(1, os.path.abspath('..'))
+    cwd = os.getcwd()
+    sys.path.insert(0, os.path.dirname(os.path.dirname(cwd)))
     from calibre.translations.pygettext import main as pygettext
     from calibre.translations.msgfmt import main as msgfmt
 
@@ -77,10 +77,15 @@ def main(args=sys.argv):
         if args[1] == 'pot':
             create_pot()
         else:
-            import_from_launchpad(args[1])            
+            import_from_launchpad(args[1])
     else:
         compile_translations()
     return 0
         
 if __name__ == '__main__':
+    cwd = os.getcwd()
+    sys.path.insert(0, os.path.dirname(os.path.dirname(cwd)))
+    print sys.path[0]
+
     sys.exit(main())
+