Settings page and validation done
Merge origin/master