reorganized entry-related graphical modules to some extent