Add Goal generator

Add Goal generation to plot  and re-arrange layout