Goal view polish

Polished Goal View
If the code is no longer used please remove