Change meal/group naming and mark placement fixing with *