DARS-102 and small styling fixes