Moved menu out of core