fix display order bug and various enhancement