Some styling fixes prior to export