menu fix, gmail smtp...
merge
Merge pull request #14 from Eorling/dev

Dev