Fix scrolling and black message