Layout menu and submenu design
fix conflict and merge