Improve meal design & fix a bug with unit