Menu Verbesserungen

Change-Id: I708cb4c59282a5a5cc90ff8a203d1d758a45844e
Signed-off-by: Stephan <stegiemail-github@yahoo.de>