better scroll handling and improved leader