names removed, icons added for goal view