Fixed scrolling + duplicate messages being displayed