DAT-2165 Fix css and names