Updated to reflext component/menu changes
Merge pull request #31 from redbadger/menu-fix

Thanks @charypar