Restructured and first attemt to fix menu