new way of handling categories
bring back type icon, fix url