Updated components for menu