link-to category doesn't bubble anymore, code cleaning