Improve category and archives view