Changes for menu component