Rewrite of adding menu entries, should prevent double menus now and forever...