Refactor of graphical/topic