some small refactoring
added menu item
Merge branch 'dev'