Layout change

Goals now in individual columns, goal moved to bottom right corner.