modify personal coach layout
fix calories unit string
merge