main view fix
Merge branch 'master' into specific-preferences