Menu refactoring
Update translation
Merge remote-tracking branch 'frodrigo/master'