Goal view polish

Polished Goal View
Please remove any code that is commented if no longer needed.