Refactor graph and make sure we see the fragment label when not expanded