Updated to reflext component/menu changes