Latest merge broke menu + add packages