Add Category column and enhance looks & feels