Remove old settings menu; change user settings urls
Add tests
Merge remote-tracking branch 'origin/master'