Improved Menu updating