diff --git a/GUI/mission_browser.xml b/GUI/mission_browser.xml
index c625988..69b40cd 100644
--- a/GUI/mission_browser.xml
+++ b/GUI/mission_browser.xml
@@ -26,27 +26,45 @@
 
 	<group>
 		<layout>hbox</layout>
-		<list>
-			<name>mission_list</name>
-			<pref-width>300</pref-width>
-			<pref-height>250</pref-height>
-			<halign>fill</halign>
-			<valign>fill</valign>
-			<stretch>true</stretch>
-			<padding>6</padding>
-			<property>/sim/mission/gui/selected-mission</property>
-			<binding>
-				<command>dialog-apply</command>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>
-					select_mission();
-				</script>
-			</binding>
-			<value>...</value>
-			<value>...</value>
-		</list>
+		<group>
+			<layout>vbox</layout>
+			<group>
+				<layout>hbox</layout>
+				<button>
+					<legend>Generic missions</legend>
+					<pref-height>30</pref-height>
+					<binding>
+					</binding>
+				</button>
+				<button>
+					<legend>Aircraft-specific missions</legend>
+					<pref-height>30</pref-height>
+					<binding>
+					</binding>
+				</button>
+			</group>
+			<list>
+				<name>mission_list</name>
+				<pref-width>300</pref-width>
+				<pref-height>250</pref-height>
+				<halign>fill</halign>
+				<valign>fill</valign>
+				<stretch>true</stretch>
+				<padding>6</padding>
+				<property>/sim/mission/gui/selected-mission</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<binding>
+					<command>nasal</command>
+					<script>
+						select_mission();
+					</script>
+				</binding>
+				<value>...</value>
+				<value>...</value>
+			</list>
+		</group>
 
 		<group>
 			<layout>vbox</layout>
@@ -97,7 +115,7 @@
 
 	<nasal>
 		<open> <![CDATA[
-			var list = cmdarg().getNode("group[1]/list");
+			var list = cmdarg().getNode("group[1]/group[0]/list");
 			var mission_root = "";
 			var selected_mission = "";
 			var data_node = props.getNode("sim/mission/gui/data", 1);
diff --git a/addon-config.xml b/addon-config.xml
new file mode 100644
index 0000000..53acc89
--- /dev/null
+++ b/addon-config.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PropertyList>
+</PropertyList>
diff --git a/addon-main.nas b/addon-main.nas
new file mode 100644
index 0000000..7d64747
--- /dev/null
+++ b/addon-main.nas
@@ -0,0 +1,19 @@
+#
+# Missions addon
+#
+# Started by Marius_A
+# Started on November 2016
+#
+# Converted to a FlightGear addon by
+# Slawek Mikula, October 2017
+
+var main = func( addon ) {
+    # setting root path to addon
+    var root = addon.basePath;
+    setprop("/sim/mission/root_path", root);
+
+    # load scripts
+    foreach(var f; ['mission.nas', 'extensions.nas', 'persistence.nas', 'gui.nas', 'utils.nas'] ) {
+        io.load_nasal( root ~ "/Nasal/" ~ f, "mission" );
+    }
+}
diff --git a/addon-metadata.xml b/addon-metadata.xml
new file mode 100644
index 0000000..678f967
--- /dev/null
+++ b/addon-metadata.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<PropertyList>
+  <meta>
+    <file-type type="string">FlightGear add-on metadata</file-type>
+    <format-version type="int">1</format-version>
+  </meta>
+
+  <addon>
+    <identifier type="string">org.flightgear.addons.Skeleton</identifier>
+    <name type="string">Skeleton</name>
+    <version type="string">1.1.1</version>
+
+    <authors>
+      <author>
+        <name type="string">Torsten Dreyer</name>
+        <email type="string"></email>
+        <url type="string"></url>
+      </author>      
+      <author>
+        <name type="string">Henning Stahlke</name>
+        <email type="string"></email>
+        <url type="string"></url>
+      </author>
+    </authors>
+
+    <maintainers>
+      <maintainer>
+        <name type="string">FlightGear developers</name>
+        <url type="string">
+          https://sourceforge.net/p/flightgear/mailman/flightgear-devel/
+        </url>
+      </maintainer>
+    </maintainers>
+
+    <short-description type="string">
+      Template add-on to help new add-on developers.
+    </short-description>
+
+    <long-description type="string">
+      This add-on does nothing particular, but you may use it as a starting point when writing a new add-on for FlightGear.
+    </long-description>
+
+    <license>
+      <designation type="string">
+        GNU GPL version 2 or later
+      </designation>
+
+      <file type="string">
+        <!-- Use a relative, slash-separated path to a file under the add-on
+             base directory that contains the add-on license text. -->
+      </file>
+
+      <url type="string">
+        https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
+      </url>
+    </license>
+
+    <min-FG-version type="string">2017.4.0</min-FG-version>
+    <max-FG-version type="string">none</max-FG-version>
+
+    <urls>
+      <home-page type="string">
+        https://example.com/FlightGear-Skeleton-addon/
+      </home-page>
+
+      <download type="string">
+        https://example.com/FlightGear-Skeleton-addon/download
+      </download>
+
+      <support type="string">
+        https://example.com/FlightGear-Skeleton-addon/support
+      </support>
+
+      <code-repository type="string">
+        https://sourceforge.net/p/flightgear/fgaddon/HEAD/tree/trunk/Addons/Skeleton/
+      </code-repository>
+    </urls>
+
+    <tags>
+      <tag type="string">skeleton</tag>
+      <tag type="string">dummy</tag>
+      <tag type="string">template</tag>
+    </tags>
+  </addon>
+</PropertyList>