Change Menu Layer Teil 2

Change-Id: Id368235964e23fb9dd1ec9d02a8a7f9a34691ef8
Signed-off-by: Tobias <pahlings@gmail.com>
Change Menu Layer Teil 3

Change-Id: I02b1296b78975418ca058de4dd2b18f81747de54
Signed-off-by: Tobias <pahlings@gmail.com>