Move 'plan' item to 'goal' item
Refactor tabular environment to be consistent
Update PDF