Some graphical refactoring