Fix of issue with namespaces

Refactor forms, main menu items, namespaces #555