restructuring layout, highlighting, using queue