add draw/listen
refine pages name