Changed application layout
Refactored code and added createMenu() function
More layouts adjustments
Returned to initial layout design
Now saved XML file has a format close to initial one
Fixed merge with master