Improve logo submenu implementation