Fixes #491
Closes #577
Closes #642
Fix bug from datadir change
Mac UI adjustments
Merge branch 'master' into session