Goal view polish

Polished Goal View
If layout in comment is no longer needed, please remove