Fix alignment and margins
Reinstate new goal