Merge some menu changes from the theme branch