Goal view polish

Polished Goal View
Will do