HH-38164 improve css and sorting