Some refactoring applied. Non-submenu Action list added, but not tested yet.