More file location tweaks - mostly GUI-related.
Mercurial revision: b58ac0a6ed12bc3dad4ce24c446b5057c2dbb19e