Added "category" format, various display-related changes