Update, Menu + Several fixes