Billel: removed multiple "[Edit]" links & switched "category" and "switch" field locations