Added Bug-Feature. Rearanged menus.