Added Goal receive amount and fixed layout