missing variable paginator
fix scroll issue for the menu
clean code
clean code