Cleaned up situation layout, added more goals

Cleaned up situation layout, added more goals