Improve submenu behaviour