Added submenu + fix