Goal view polish

Polished Goal View