Refactor the front-end : group nodes by table rather than by type