Fixed merged conflicts from menu branch

diff --cc lib/gui_lite.py
index 321fd86,4316e58..e1013ff
--- 1/lib/gui_lite.py
--- 2/lib/gui_lite.py
+++ b/lib/gui_lite.py
@@@ -185,23 -163,29 +157,30 @@@ class MiniWindow(QDialog)
          amount_layout.addWidget(self.amount_input)
          amount_layout.addStretch()
  
 -        send_button = QPushButton(_("&Send"))
 -        send_button.setObjectName("send_button")
 -        self.connect(send_button, SIGNAL("clicked()"), self.send)
 +        self.send_button = QPushButton(_("&Send"))
 +        self.send_button.setObjectName("send_button")
 +        self.send_button.setDisabled(True);
 +        self.connect(self.send_button, SIGNAL("clicked()"), self.send)
  
          main_layout = QGridLayout(self)
-         main_layout.addWidget(accounts_button, 0, 0)
-         main_layout.addWidget(interact_button, 1, 0)
-         main_layout.addWidget(expand_button, 2, 0)
  
-         main_layout.addWidget(self.balance_label, 0, 1)
-         main_layout.addWidget(self.receive_button, 0, 2)
+         main_layout.addWidget(self.balance_label, 0, 0)
+         main_layout.addWidget(self.receive_button, 0, 1)
+ 
+         main_layout.addWidget(self.address_input, 1, 0, 1, -1)
  
-         main_layout.addLayout(address_layout, 1, 1, 1, -1)
+         main_layout.addLayout(amount_layout, 2, 0)
 -        main_layout.addWidget(send_button, 2, 1)
++        main_layout.addWidget(self.send_button, 2, 1)
  
-         main_layout.addLayout(amount_layout, 2, 1)
-         main_layout.addWidget(self.send_button, 2, 2)
+         menubar = QMenuBar()
+         file_menu = menubar.addMenu(_("&File"))
+         file_menu.addAction(_("Open"))
+         view_menu = menubar.addMenu(_("&View"))
+         view_menu.addMenu(_("&Themes"))
+         view_menu.addAction(_("Show History"))
+         menubar.addMenu(_("&Settings"))
+         menubar.addMenu(_("&Help"))
+         main_layout.setMenuBar(menubar)
  
          quit_shortcut = QShortcut(QKeySequence("Ctrl+Q"), self)
          self.connect(quit_shortcut, SIGNAL("activated()"), self.close)
@@@ -263,16 -243,9 +242,11 @@@
              quote_text = "(%s)" % quote_text
          btc_balance = "%.2f" % (btc_balance / bitcoin(1))
          self.balance_label.set_balance_text(btc_balance, quote_text)
-         main_account_info = \
-             "Checking - %s BTC" % btc_balance
-         self.setWindowTitle("Electrum - %s" % main_account_info)
-         self.accounts_selector.clear()
-         self.accounts_selector.addAction("%s %s" % (main_account_info,
-                                                     quote_text))
+         self.setWindowTitle("Electrum - %s BTC" % btc_balance)
  
      def amount_input_changed(self, amount_text):
 +        self.check_button_status()
 +
          try:
              amount = D(str(amount_text))
          except decimal.InvalidOperation: