Menu and Entity changes