Fixed some bugs

Menu and MenuIcons did not commit last time