Remove nested layouts in the pop-up
Remove unused menus XML
Modify *Task according to LAHSpectre