settings popup form separated in a common directory
Merge origin/master