[#68391596 #68391598] restyled according to the comps

Signed-off-by: Jenny Allar <jennyallar@gmail.com>