Fix CSS, deal with goal-completed cases