Design fixes
Various account fixes
Merge pull request #460 from dswd/account-fixes

Various account fixes
Various fixes and improvements
Merge branch 'fixes' into some-fixes
Merge pull request #461 from dswd/some-fixes

Some fixes
Merge branch 'master' of ssh://github.com/GLab/ToMaTo into fixes__