Fixed menu type 2 after some code merge from branch