Fix types, change styling