Add scroll icons, clean up