Better handling of custom menu lumps

Thanks fraggle!