+++ Added menu items
+++ Bug fixes