Much better, made categories a little prettier