Lint and formatting fixes
Ignore "+ add account"
Merge pull request #561 from mc10/bug-fixes

Bug fixes