Redesign for commands, bugfixes
Commit more, do the same, too many fixes...
add base templates for the mails