Improved Menu Components and Wraps