Fix bugs with sub menu, embed menu and scrolling